Fixed a bug where if MAXUSRARGS amount of args were passed in, the argv[]

array would end up without the NULL pointer termination, causing the glob
code to glob whatever garbage happend to follow on the stack.
This commit is contained in:
David Greenman 1998-04-27 10:51:26 +00:00
parent 30bdeb1201
commit b81d7e37bb
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=35474

View File

@ -39,7 +39,7 @@
static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94";
#endif
static const char rcsid[] =
"$Id: popen.c,v 1.9 1997/11/21 07:38:43 charnier Exp $";
"$Id: popen.c,v 1.10 1998/02/25 07:10:57 danny Exp $";
#endif /* not lint */
#include <sys/types.h>
@ -94,9 +94,11 @@ ftpd_popen(program, type)
return (NULL);
/* break up string into pieces */
for (argc = 0, cp = program; argc < MAXUSRARGS; cp = NULL)
for (argc = 0, cp = program; argc < MAXUSRARGS; cp = NULL) {
if (!(argv[argc++] = strtok(cp, " \t\n")))
break;
}
argv[argc - 1] = NULL;
/* glob each piece */
gargv[0] = argv[0];