* environ.cc (setenv): Use __cygwin_environ instead of

        environ after reallocating environment space.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 976a685..56c48a8 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 17 17:56:00 2000  Corinna Vinschen <corinna@vinschen.de>
+
+       * environ.cc (setenv): Use __cygwin_environ instead of
+       environ after reallocating environment space.
+
 Sun Jul 16 20:23:21 2000  Christopher Faylor <cgf@cygnus.com>
 
        * _cygwin_crt0_common.cc: Undef 'environ' or suffer compiler error.

diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index 4aa5ad7..b536007 100644 (file)
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -228,9 +228,9 @@ setenv (const char *name, const char *value, int rewrite)
        ;
       __cygwin_environ = (char **) realloc ((char *) environ,
                                   (size_t) (sizeof (char *) * (cnt + 2)));
-      if (!environ)
+      if (!__cygwin_environ)
        return -1;
-      environ[cnt + 1] = NULL;
+      __cygwin_environ[cnt + 1] = NULL;
       update_envptrs ();
       offset = cnt;
     }