printenv: fix environ == NULL segfault

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/coreutils/printenv.c b/coreutils/printenv.c
index 33be5c09601aea7a38c32349d415ba5fd7428734..d0fb71636d8bce7bf2dbb0c9eee098a509abb5b5 100644 (file)
--- a/coreutils/printenv.c
+++ b/coreutils/printenv.c
@@ -19,9 +19,14 @@ int printenv_main(int argc UNUSED_PARAM, char **argv)
 
        /* no variables specified, show whole env */
        if (!argv[1]) {
-               int e = 0;
-               while (environ[e])
-                       puts(environ[e++]);
+               char **e = environ;
+
+               /* environ can be NULL! (for example, after clearenv())
+                * Check for that:
+                */
+               if (e)
+                       while (*e)
+                               puts(*e++);
        } else {
                /* search for specified variables and print them out if found */
                char *arg, *env;

diff --git a/coreutils/test.c b/coreutils/test.c
index 8248a1ef52fdf4e0f6416369d2d50ddd313ce441..2d245be6c80534731665b2b85b8c17bfd1773112 100644 (file)
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -45,7 +45,7 @@
 /* This is a NOFORK applet. Be very careful! */
 
 /* 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. */
 
 /* test(1) accepts the following grammar: