(malloc_initialize_hook): Handle case thet `environ'

is null.

2 files changed, 4 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 44015eb9296..69ab0fe6bdf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-19  Gerd Moellmann  <gerd@gnu.org>
 
+        * emacs.c (malloc_initialize_hook): Handle case thet `environ'
+        is null.
+
         * ralloc.c (__morecore) [!SYSTEM_MALLOC]: Move declaration
         to the start of the file.
 
diff --git a/src/emacs.c b/src/emacs.c
index e2b1bffe819..023c036e566 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -675,7 +675,7 @@ malloc_initialize_hook ()
         {
           char **p;
 
-          for (p = environ; *p; p++)
+          for (p = environ; p && *p; p++)
             if (strncmp (*p, "MALLOC_CHECK_=", 14) == 0)
               {
                 do