This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 1bcfb89cd14742e49e36b5a67eaee2502e2e40a9 (commit)
via e83eeb15cccdcca9970355deb4dd877c1a570247 (commit)
via f25464c79226fc5b9f32f9c3e1836c6650e8623e (commit)
from 8311058a16b79294e8b4994c21e3cc63b9956f9d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/1bcfb89cd14742e49e36b5a67eaee2502e2e40a9
commit 1bcfb89cd14742e49e36b5a67eaee2502e2e40a9
Author: Tobias Stoeckmann <[email protected]>
Date: Sun Apr 29 13:44:21 2012 +0200
Adjust OpenBSD-specific code to match OpenBSD-current
Also fix null pointer dereference by NOT calling strlen on a possible
null pointer.
diff --git a/src/osdep_bsd.c b/src/osdep_bsd.c
index 372b4cf..dbcdf9e 100644
--- a/src/osdep_bsd.c
+++ b/src/osdep_bsd.c
@@ -106,11 +106,11 @@ Bool GetCommandForPid(int pid, char ***argv, int *argc)
procs = 0;
/* the process we are interested in */
- if ((kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &procs)) == NULL ||
procs == 0)
+ if ((kp = kvm_getprocs(kd, KERN_PROC_PID, pid, sizeof(*kp), &procs)) ==
NULL || procs == 0)
/* if kvm_getprocs() bombs out or does not find the process */
return False;
- /* get it's argv */
+ /* get its argv */
if ((nargv = kvm_getargv(kd, kp, 0)) == NULL)
return False;
@@ -120,11 +120,11 @@ Bool GetCommandForPid(int pid, char ***argv, int *argc)
/*
* must have this much free space in `args' in order for the current
* iteration not to overflow it: we are at `count', and will append
- * the next ((*argc)+1) arg and a null (+1)
+ * the next (*argc) arg and a nul (+1)
* technically, overflow (or truncation, which isn't handled) can not
* happen (should not, at least).
*/
- #define ARGSPACE ( count + strlen(nargv[ (*argc) + 1 ] ) + 1 )
+ #define ARGSPACE ( count + strlen(nargv[ (*argc) ] ) + 1 )
while (nargv[*argc] && ARGSPACE < argmax ) {
memcpy(args + count, nargv[*argc], strlen(nargv[*argc]));
count += strlen(nargv[*argc]) + 1;
http://repo.or.cz/w/wmaker-crm.git/commit/e83eeb15cccdcca9970355deb4dd877c1a570247
commit e83eeb15cccdcca9970355deb4dd877c1a570247
Author: Tobias Stoeckmann <[email protected]>
Date: Sun Apr 29 13:43:31 2012 +0200
Include assert.h to avoid linker issues if -DDEBUG was not supplied.
diff --git a/WINGs/string.c b/WINGs/string.c
index aabad31..d2e8b2a 100644
--- a/WINGs/string.c
+++ b/WINGs/string.c
@@ -10,6 +10,7 @@
#include <string.h>
#include <stdlib.h>
+#include <assert.h>
#include <ctype.h>
#ifdef HAVE_BSD_STRING_H
#include <bsd/string.h>
http://repo.or.cz/w/wmaker-crm.git/commit/f25464c79226fc5b9f32f9c3e1836c6650e8623e
commit f25464c79226fc5b9f32f9c3e1836c6650e8623e
Author: Tobias Stoeckmann <[email protected]>
Date: Sun Apr 29 13:42:30 2012 +0200
Avoid GNUism in Makefiles for *BSD support
Variable abs_srcdir will always point to proper source location.
With this patch, there is no need to call gmake on OpenBSD anymore.
diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index 2295718..0c8f57f 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -111,13 +111,13 @@ get-wings-flags: get-wings-flags.in Makefile
-e 's#$${GFXLIBS}#$(GFXLIBS)#;' -e
's#$${XFTLIBS}#$(XFTLIBS)#;' -e 's#$${INTLIBS}#$(INTLIBS)#;' -
-e 's#$${XLIBS}#$(XLIBS)#;' < $(dir $<@)get-wings-flags.in > $@
+ -e 's#$${XLIBS}#$(XLIBS)#;' < $(abs_srcdir)/get-wings-flags.in
> $@
@chmod 755 $@
get-wutil-flags: get-wutil-flags.in Makefile
@echo "Generating $@"
@$(SED) -e 's#$${includedir}#$(includedir)#;' -e
's#$${libdir}#$(libdir)#;' - -e 's#$${INTLIBS}#$(INTLIBS)#;' < $(dir
$<@)get-wutil-flags.in > $@
+ -e 's#$${INTLIBS}#$(INTLIBS)#;' <
$(abs_srcdir)/get-wutil-flags.in > $@
@chmod 755 $@
diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am
index 8dec1f6..b191158 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -69,6 +69,6 @@ get-wraster-flags: get-wraster-flags.in Makefile
@$(SED) -e 's#$${inc_search_path}#$(inc_search_path)#;'
-e 's#$${lib_search_path}#$(lib_search_path)#;' -e
's#$${GFXLIBS}#$(GFXLIBS)#;' - -e 's#$${XLIBS}#$(XLIBS)#;' <
$(dir $<@)get-wraster-flags.in > $@
+ -e 's#$${XLIBS}#$(XLIBS)#;' <
$(abs_srcdir)/get-wraster-flags.in > $@
@chmod 755 $@
-----------------------------------------------------------------------
Summary of changes:
WINGs/Makefile.am | 4 ++--
WINGs/string.c | 1 +
src/osdep_bsd.c | 8 ++++----
wrlib/Makefile.am | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
