gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

Adjust OpenBSD-specific code to match OpenBSD-current

Browse Source 
Also fix null pointer dereference by NOT calling strlen on a possible
null pointer.
This commit is contained in:
Tobias Stoeckmann
2012-04-29 13:44:21 +02:00
committed by Carlos R. Mafra
parent e83eeb15cc
commit 1bcfb89cd1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osdep_bsd.c
View File

@@ -106,11 +106,11 @@ Bool GetCommandForPid(int pid, char ***argv, int *argc)
procs = 0; procs = 0;
/* the process we are interested in */ /* 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 */ /* if kvm_getprocs() bombs out or does not find the process */
return False; return False;
/* get it's argv */ /* get its argv */
if ((nargv = kvm_getargv(kd, kp, 0)) == NULL) if ((nargv = kvm_getargv(kd, kp, 0)) == NULL)
return False; 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 * 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 * 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 * technically, overflow (or truncation, which isn't handled) can not
* happen (should not, at least). * 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 ) { while (nargv[*argc] && ARGSPACE < argmax ) {
memcpy(args + count, nargv[*argc], strlen(nargv[*argc])); memcpy(args + count, nargv[*argc], strlen(nargv[*argc]));
count += strlen(nargv[*argc]) + 1; count += strlen(nargv[*argc]) + 1;