circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 01:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Don't accept NULL argv[0].

Browse Source
This commit is contained in:
Nicholas Marriott 2009-02-08 13:03:43 +00:00
parent 091c08fcaa
commit 4264ad761d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osdep-freebsd.c
View File

@ -1,4 +1,4 @@
/* $Id: osdep-freebsd.c,v 1.10 2009-02-08 12:33:03 nicm Exp $ */ /* $Id: osdep-freebsd.c,v 1.11 2009-02-08 13:03:43 nicm Exp $ */
/* /*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -81,8 +81,10 @@ retry:
if (buf[i].ki_tdev != sb.st_rdev) if (buf[i].ki_tdev != sb.st_rdev)
continue; continue;
p = &buf[i]; p = &buf[i];
if (bestp == NULL) if (bestp == NULL) {
bestp = p; bestp = p;
continue;
}
if (is_runnable(p) && !is_runnable(bestp)) if (is_runnable(p) && !is_runnable(bestp))
bestp = p; bestp = p;
@ -130,7 +132,7 @@ char *
get_proc_argv0(pid_t pid) get_proc_argv0(pid_t pid)
{ {
int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, 0 }; int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, 0 };
size_t size; size_t size, size2;
char *args, *args2, *procname; char *args, *args2, *procname;
mib[3] = pid; mib[3] = pid;
@ -143,12 +145,14 @@ get_proc_argv0(pid_t pid)
if ((args2 = realloc(args, size)) == NULL) if ((args2 = realloc(args, size)) == NULL)
break; break;
args = args2; args = args2;
if (sysctl(mib, 4, args, &size, NULL, 0) == -1) { size2 = size;
if (sysctl(mib, 4, args, &size2, NULL, 0) == -1) {
if (errno == ENOMEM) if (errno == ENOMEM)
continue; continue;
break; break;
} }
procname = strdup(args); if (size2 > 0 && *args != '\0')
procname = strdup(args);
break; break;
} }
free(args); free(args);