* cygheap.cc (cygheap_user::set_name): Revert previous change.

	* environ.cc (spenv::retrieve): Check return value of call to
	cygheap->user.*from_cygheap().

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a395e9aa04cfe8d13a824f1f51f10b8c20b93bf6..e74d0dfaf765a1cbcf67181af0f18df4b49b8174 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-13  Corinna Vinschen  <corinna@vinschen.de>
+
+       * cygheap.cc (cygheap_user::set_name): Revert previous change.
+       * environ.cc (spenv::retrieve): Check return value of call to
+       cygheap->user.*from_cygheap().
+
 2002-06-13  Corinna Vinschen  <corinna@vinschen.de>
 
        * cygheap.cc (cygheap_user::set_name): Remove setting homedrive and

diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
index 3fd2aacc9551f35e16d19da7e9dbea5af83145d1..723fde2ffcc8df111a6b5956eac04f540911e2a9 100644 (file)
--- a/winsup/cygwin/cygheap.cc
+++ b/winsup/cygwin/cygheap.cc
@@ -443,6 +443,8 @@ cygheap_user::set_name (const char *new_name)
   if (pname)
     cfree (pname);
   pname = cstrdup (new_name ? new_name : "");
+  homedrive = NULL;
+  homepath = NULL;
 }
 
 void

diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index da96b5245553616faf3b2cee87a74c35a02838e7..4d535e436c0bc1ab0e54a0319165d9f6b7689f87 100644 (file)
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -786,7 +786,8 @@ spenv::retrieve (bool no_envblock, const char *const envname, int len)
 
       /* Make a FOO=BAR entry from the value returned by the cygheap_user
          method. */
-      p = (cygheap->user.*from_cygheap) ();
+      if (!(p = (cygheap->user.*from_cygheap) ()))
+        return NULL;
       int namelen = strlen (name);
       char *s = (char *) cmalloc (HEAP_1_STR, namelen + strlen (p) + 1);
       strcpy (s, name);