From: Junio C Hamano <gitster@pobox.com>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Michael J Gruber <git@drmicha.warpmail.net>
Subject: [PATCH v3 4/4] restore_env(): free the saved environment variable once we are done
Date: Tue, 02 Feb 2016 15:50:02 -0800 [thread overview]
Message-ID: <xmqqio26pt91.fsf_-_@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqy4ba627n.fsf_-_@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Wed, 27 Jan 2016 15:18:36 -0800")
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 <gitster@pobox.com>
---
* This is new.
git.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/git.c b/git.c
index 1cbe267..93f569d 100644
--- 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]);
+ }
}
}
--
2.7.0-391-gcd29568
next prev parent reply other threads:[~2016-02-02 23:50 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-26 7:37 [BUG] typo DWIMery with alias broken (cd to random dir) Michael J Gruber
2016-01-26 12:50 ` Duy Nguyen
2016-01-26 13:26 ` [PATCH] git.c: fix help.autocorrect after 57ea712 breaks it Nguyễn Thái Ngọc Duy
2016-01-26 14:39 ` Michael J Gruber
2016-01-26 17:44 ` Junio C Hamano
2016-01-26 19:02 ` Junio C Hamano
2016-01-26 20:11 ` Junio C Hamano
2016-01-27 6:49 ` Junio C Hamano
2016-01-27 6:50 ` [PATCH 2/3] git: protect against unbalanced calls to {save,restore}_env() Junio C Hamano
2016-01-27 23:19 ` [PATCH v2 " Junio C Hamano
2016-01-27 6:52 ` [PATCH 3/3] git: simplify environment save/restore logic Junio C Hamano
2016-01-27 23:22 ` [PATCH v2 " Junio C Hamano
2016-01-27 23:47 ` Junio C Hamano
2016-01-27 9:14 ` [PATCH] git.c: fix help.autocorrect after 57ea712 breaks it Duy Nguyen
2016-01-27 12:01 ` Junio C Hamano
2016-01-27 23:18 ` [PATCH v2 1/3] git: remove an early return from save_env_before_alias() Junio C Hamano
2016-02-02 23:47 ` [PATCH v3 1/4] " Junio C Hamano
2016-02-02 23:47 ` [PATCH v3 2/4] git: protect against unbalanced calls to {save,restore}_env() Junio C Hamano
2016-02-02 23:48 ` [PATCH v3 3/4] git: simplify environment save/restore logic Junio C Hamano
2016-02-02 23:50 ` Junio C Hamano [this message]
2016-02-03 1:47 ` [PATCH v3 4/4] restore_env(): free the saved environment variable once we are done Eric Sunshine
2016-02-03 2:19 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqio26pt91.fsf_-_@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.