diff options
author | Damien Miller <djm@mindrot.org> | 2000-03-15 11:23:48 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-03-15 11:23:48 +1100 |
commit | f09b07a971f64cf69f2c45a364c3d56559f7c1c3 (patch) | |
tree | 2a4b60794ed6f366a89646c24f48a944522907e1 | |
parent | a1ad4802fff669b20c49cbd9b682460085b2d50a (diff) |
- Don't free argument to putenv() after use (in setenv() replacement).
Report from Seigo Tanimura <tanimura@r.dl.itc.u-tokyo.ac.jp>
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | bsd-misc.c | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20000315 | 1 | 20000315 |
2 | - Fix broken CFLAGS handling during search for OpenSSL. Fixes va_list | 2 | - Fix broken CFLAGS handling during search for OpenSSL. Fixes va_list |
3 | problems with gcc/Solaris. | 3 | problems with gcc/Solaris. |
4 | - Don't free argument to putenv() after use (in setenv() replacement). | ||
5 | Report from Seigo Tanimura <tanimura@r.dl.itc.u-tokyo.ac.jp> | ||
4 | 6 | ||
5 | 20000314 | 7 | 20000314 |
6 | - Include macro for IN6_IS_ADDR_V4MAPPED. Report from | 8 | - Include macro for IN6_IS_ADDR_V4MAPPED. Report from |
diff --git a/bsd-misc.c b/bsd-misc.c index 99fe29816..83cb0b85d 100644 --- a/bsd-misc.c +++ b/bsd-misc.c | |||
@@ -154,7 +154,10 @@ int setenv(const char *name, const char *value, int overwrite) | |||
154 | 154 | ||
155 | result = putenv(env_string); | 155 | result = putenv(env_string); |
156 | 156 | ||
157 | xfree(env_string); | 157 | /* Putenv doesn't copy the env_string, so we need to keep a copy of it */ |
158 | /* around. This leaks a bit of memory, but it doesn't matter */ | ||
159 | /* for our (OpenSSH port ) use: setenv is only used twice in ssh-agent */ | ||
160 | /* xfree(env_string); */ | ||
158 | 161 | ||
159 | return(result); | 162 | return(result); |
160 | } | 163 | } |