(malloc_initialize_hook): Handle case thet `environ'

is null.

diff --git a/src/ChangeLog b/src/ChangeLog
index 44015eb92969ad22e052a69ee338cb0161d239ad..69ab0fe6bdf844bdee7fce474ddb0f3e7ce48626 100644 (file)
--- 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 e2b1bffe81981cce50841f3a3db7b3b39de75eff..023c036e5664f605b7a9f3734bdc39fab4c81e4b 100644 (file)
--- 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