From: Junio C Hamano <junkio@cox.net>
Date: Sun, 4 Dec 2005 22:41:35 +0000 (-0800)
Subject: compat/setenv: do not free what we fed putenv(3).
X-Git-Tag: v0.99.9m^2~85
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3a2674337c12e958f8c697af991a0ef6c06ddd4d;p=git.git

compat/setenv: do not free what we fed putenv(3).

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/compat/setenv.c b/compat/setenv.c
index 94acd2da9..b7d767859 100644
--- a/compat/setenv.c
+++ b/compat/setenv.c
@@ -16,7 +16,7 @@ int gitsetenv(const char *name, const char *value, int replace)
 
 	namelen = strlen(name);
 	valuelen = strlen(value);
-	envstr = malloc((namelen + valuelen + 2) * sizeof(char));
+	envstr = malloc((namelen + valuelen + 2));
 	if (!envstr) return -1;
 
 	memcpy(envstr, name, namelen);
@@ -25,7 +25,11 @@ int gitsetenv(const char *name, const char *value, int replace)
 	envstr[namelen + valuelen + 1] = 0;
 
 	out = putenv(envstr);
+	/* putenv(3) makes the argument string part of the environment,
+	 * and changing that string modifies the environment --- which
+	 * means we do not own that storage anymore.  Do not free
+	 * envstr.
+	 */
 
-	free(envstr);
 	return out;
 }