diff options
| author | Christopher Faylor <me@cgf.cx> | 2000-09-03 08:45:52 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2000-09-03 08:45:52 +0400 |
| commit | d8242040b8ee07aebd1f80de6cc23cd3cb825914 (patch) | |
| tree | e8a1c2785301be321979aac6b3e5b99ba3322070 /winsup | |
| parent | b0e82b74fbdfa2dee89505aba03f2827480cc8ca (diff) | |
* environ.cc (environ_init): Don't free the new environment table after we've
just copied stuff to it.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/environ.cc | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 90c7bea3a..35845b3d9 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +Sun Sep 3 00:38:40 2000 Christopher Faylor <cgf@cygnus.com> + + * environ.cc (environ_init): Don't free the new environment table after + we've just copied stuff to it. + Sun Sep 3 00:07:32 2000 Christopher Faylor <cgf@cygnus.com> * Makefile.in: Add cygheap.o. diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc index 89ad0ab13..2cc8080f7 100644 --- a/winsup/cygwin/environ.cc +++ b/winsup/cygwin/environ.cc @@ -19,6 +19,7 @@ details. */ #include "fhandler.h" #include "path.h" #include "cygerrno.h" +#include "cygheap.h" extern BOOL allow_glob; extern BOOL allow_ntea; @@ -535,8 +536,9 @@ environ_init (char **envp) { sz = envsize (envp, 1); char **newenv = (char **) malloc (sz); - envp = (char **) memcpy (newenv, envp, sz); + memcpy (newenv, envp, sz); cfree (envp); + envp = newenv; goto out; } |