* cygheap.cc (cygheap_user::set_name): Revert previous change.
* environ.cc (spenv::retrieve): Check return value of call to cygheap->user.*from_cygheap().
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user