restore_env(): free the saved environment variable once we are done

gitster · gitster · commit 8384c139cb94 · 2016-02-02T15:42:59.000-08:00
Just like we free orig_cwd, which is the value of the original
working directory saved in save_env_before_alias(), once we are
done with it, the contents of orig_env[] array, saved in the
save_env_before_alias() function should be freed; otherwise,
the second and subsequent calls to save/restore pair will leak
the memory allocated in save_env_before_alias().

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git.c b/git.c
@@ -54,10 +54,12 @@ static void restore_env(int external_alias)
 		if (external_alias &&
 		    !strcmp(env_names[i], GIT_PREFIX_ENVIRONMENT))
 			continue;
-		if (orig_env[i])
+		if (orig_env[i]) {
 			setenv(env_names[i], orig_env[i], 1);
-		else
+			free(orig_env[i]);
+		} else {
 			unsetenv(env_names[i]);
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,12 @@ static void restore_env(int external_alias)`
`54`	`54`	`if (external_alias &&`
`55`	`55`	`!strcmp(env_names[i], GIT_PREFIX_ENVIRONMENT))`
`56`	`56`	`continue;`
`57`		`- if (orig_env[i])`
	`57`	`+ if (orig_env[i]) {`
`58`	`58`	`setenv(env_names[i], orig_env[i], 1);`
`59`		`- else`
	`59`	`+ free(orig_env[i]);`
	`60`	`+ } else {`
`60`	`61`	`unsetenv(env_names[i]);`
	`62`	`+ }`
`61`	`63`	`}`
`62`	`64`	`}`
`63`	`65`