emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

printenv: fix environ == NULL segfault

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-03-08 12:44:02 +01:00
parent 6b6af53426
commit 86cf0364bd
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
coreutils/printenv.c
View File

@ -19,9 +19,14 @@ int printenv_main(int argc UNUSED_PARAM, char **argv)
/* no variables specified, show whole env */ /* no variables specified, show whole env */
if (!argv[1]) { if (!argv[1]) {
int e = 0; char **e = environ;
while (environ[e])
puts(environ[e++]); /* environ can be NULL! (for example, after clearenv())
* Check for that:
*/
if (e)
while (*e)
puts(*e++);
} else { } else {
/* search for specified variables and print them out if found */ /* search for specified variables and print them out if found */
char *arg, *env; char *arg, *env;

2
coreutils/test.c
View File

@ -45,7 +45,7 @@
/* This is a NOFORK applet. Be very careful! */ /* This is a NOFORK applet. Be very careful! */
/* test_main() is called from shells, and we need to be extra careful here. /* test_main() is called from shells, and we need to be extra careful here.
* This is true regardless of PREFER_APPLETS and STANDALONE_SHELL * This is true regardless of PREFER_APPLETS and SH_STANDALONE
* state. */ * state. */
/* test(1) accepts the following grammar: /* test(1) accepts the following grammar: