d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent overflowing the buffer that stores the command arguments.

Browse Source 
PR:		bin/19422
Not objected to by: -audit
MFC after:	3 weeks
This commit is contained in:
Mike Heffner 2002-01-20 01:30:40 +00:00
parent 12f63f1741
commit 6b8a6a6e6c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/ps/fmt.c
View File

@ -61,7 +61,8 @@ static char *
shquote(argv)
char **argv;
{
long arg_max;
static long arg_max = -1;
long len;
char **p, *dst, *src;
static char *buf = NULL;
@ -80,13 +81,16 @@ shquote(argv)
for (p = argv; (src = *p++) != 0; ) {
if (*src == 0)
continue;
strvis(dst, src, VIS_NL | VIS_CSTYLE);
len = (4 * arg_max - (dst - buf)) / 4;
strvisx(dst, src, strlen(src) < len ? strlen(src) : len,
VIS_NL | VIS_CSTYLE);
while (*dst)
dst++;
*dst++ = ' ';
if ((4 * arg_max - (dst - buf)) / 4 > 0)
*dst++ = ' ';
}
/* Chop off trailing space */
if (dst != buf)
if (dst != buf && dst[-1] == ' ')
dst--;
*dst = '\0';
return (buf);