Merge commit '19311bfa7b8e8c6effa9c375de9b0eb4338bee12' into merge

Conflicts:
	coreutils/ls.c
	shell/ash.c

1 files changed, 8 insertions, 3 deletions

diff --git a/coreutils/printenv.c b/coreutils/printenv.c
index 33be5c096..d0fb71636 100644
--- 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;