On Tue, Feb 2, 2016 at 6:50 PM, Junio C Hamano <[email protected]> wrote:
> 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 <[email protected]>
> ---
> 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]);
Now that this is "well-protected"[1] against incorrect nesting, you
don't worry about the dangling pointers in static orig_env[], right?
(The same for the dangling pointer in static 'orig_cwd' after being
freed a bit earlier in this function, correct?)
[1]: via assert()
> + } else {
> unsetenv(env_names[i]);
> + }
> }
> }
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
