From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: git@vger•kernel.org, Johannes Schindelin <johannes.schindelin@gmx•de>
Subject: Re: [PATCH v2 1/2] Clean stale environment pointer in finish_command()
Date: Mon, 10 Nov 2014 13:44:24 -0800 [thread overview]
Message-ID: <xmqqbnoe91dz.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <df1b16208e443416f7185c8c8c110e637ea97ac4.1415630072.git.johannes.schindelin@gmx.de> (Johannes Schindelin's message of "Mon, 10 Nov 2014 15:38:36 +0100 (CET)")
Johannes Schindelin <johannes.schindelin@gmx•de> writes:
> In start_command(), unset "env" fields are initialized via "env_array". In
> finish_command(), the "env_array" is cleared, therefore the "env" field
> will point to free()d data.
>
> However, start_command() will set "env" to env_array.argv only if "env"
> was unset to begin with, and if it was already set, the caller will need
> the original value. Therefore, we need to be very careful only to reset
> "env" in finish_command() when it has been initialized in start_command().
Hmph. Does the same observation apply to cmd->argv that is
initialied to point to cmd->args.argv only when it is unset?
These managed argv/env arrays originate from c460c0ec (run-command:
store an optional argv_array, 2014-05-15), so I am CC'ing Peff. I
think this change makes sense but I suspect we should do the same
for args.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx•de>
> ---
> run-command.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/run-command.c b/run-command.c
> index 79a0a76..85578da 100644
> --- a/run-command.c
> +++ b/run-command.c
> @@ -555,6 +555,9 @@ int finish_command(struct child_process *cmd)
> {
> int ret = wait_or_whine(cmd->pid, cmd->argv[0]);
> argv_array_clear(&cmd->args);
> + /* Avoid pointing to a stale environment */
> + if (cmd->env == cmd->env_array.argv)
> + cmd->env = NULL;
> argv_array_clear(&cmd->env_array);
> return ret;
> }
next prev parent reply other threads:[~2014-11-10 21:44 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-07 13:58 [PATCH 0/2] Support updating working trees when pushing into non-bare repos Johannes Schindelin
2014-11-07 13:58 ` [PATCH 1/2] Add a few more values for receive.denyCurrentBranch Johannes Schindelin
2014-11-07 18:49 ` Junio C Hamano
2014-11-07 18:58 ` Johannes Schindelin
2014-11-10 12:54 ` Johannes Schindelin
2014-11-10 16:00 ` Junio C Hamano
2014-11-12 11:13 ` Johannes Schindelin
2014-11-12 18:00 ` Junio C Hamano
2014-11-08 11:18 ` Jeff King
2014-11-08 18:48 ` brian m. carlson
2014-11-10 13:03 ` Johannes Schindelin
2014-11-07 13:58 ` [PATCH 2/2] Let deny.currentBranch=updateInstead ignore submodules Johannes Schindelin
2014-11-07 19:20 ` Junio C Hamano
2014-11-09 16:42 ` Jens Lehmann
2014-11-10 13:04 ` Johannes Schindelin
2014-11-10 13:01 ` Johannes Schindelin
2014-11-10 15:42 ` Junio C Hamano
2014-11-10 19:32 ` Junio C Hamano
2014-11-12 11:09 ` Johannes Schindelin
2014-11-12 17:59 ` Junio C Hamano
2014-11-13 10:29 ` Johannes Schindelin
2014-11-13 10:38 ` Johannes Schindelin
2014-11-13 17:41 ` Junio C Hamano
2014-11-13 18:55 ` Johannes Schindelin
2014-11-13 19:48 ` Junio C Hamano
2014-11-13 21:06 ` Junio C Hamano
2014-11-14 7:49 ` Junio C Hamano
2014-12-02 3:24 ` Junio C Hamano
2014-12-02 3:25 ` [PATCH 2/2] receive-pack: support push-to-checkout hook Junio C Hamano
2014-12-02 8:47 ` Johannes Schindelin
2014-12-02 13:03 ` Michael J Gruber
2014-12-02 13:25 ` Johannes Schindelin
2014-12-02 16:39 ` Junio C Hamano
2014-12-02 16:45 ` Johannes Schindelin
2014-12-02 17:00 ` Junio C Hamano
2014-12-02 17:12 ` Johannes Schindelin
2014-12-02 17:19 ` Junio C Hamano
2014-11-13 17:41 ` [PATCH 2/2] Let deny.currentBranch=updateInstead ignore submodules Junio C Hamano
2014-11-12 11:06 ` Johannes Schindelin
2014-11-10 14:38 ` [PATCH v2 0/2] Support updating working trees when pushing into non-bare repos Johannes Schindelin
2014-11-13 11:03 ` [PATCH v3 0/1] " Johannes Schindelin
2014-11-13 11:03 ` [PATCH v3 1/1] Add another option for receive.denyCurrentBranch Johannes Schindelin
2014-11-13 17:51 ` Junio C Hamano
2014-11-13 19:21 ` Johannes Schindelin
2014-11-13 17:47 ` [PATCH v3 0/1] Support updating working trees when pushing into non-bare repos Junio C Hamano
2014-11-13 19:11 ` Junio C Hamano
2014-11-13 19:18 ` Johannes Schindelin
2014-11-26 20:21 ` [PATCH v4] " Johannes Schindelin
2014-11-26 20:21 ` [PATCH v4] Add another option for receive.denyCurrentBranch Johannes Schindelin
2014-11-26 21:02 ` Junio C Hamano
2014-11-26 22:44 ` [PATCH v5] Support updating working trees when pushing into non-bare repos Johannes Schindelin
2014-11-26 22:44 ` [PATCH v5] Add another option for receive.denyCurrentBranch Johannes Schindelin
2014-12-01 3:18 ` Junio C Hamano
2014-12-01 7:44 ` Johannes Schindelin
2014-12-01 23:49 ` Junio C Hamano
2014-12-02 0:51 ` Junio C Hamano
2014-12-02 8:21 ` Johannes Schindelin
2014-12-02 16:20 ` Junio C Hamano
2014-12-02 16:51 ` Johannes Schindelin
2014-12-02 17:23 ` Junio C Hamano
[not found] ` <cover.1415630072.git.johannes.schindelin@gmx.de>
2014-11-10 14:38 ` [PATCH v2 1/2] Clean stale environment pointer in finish_command() Johannes Schindelin
2014-11-10 14:41 ` Johannes Schindelin
2014-11-11 3:16 ` Jeff King
2014-11-11 15:55 ` Junio C Hamano
2014-11-12 10:45 ` Johannes Schindelin
2014-11-12 10:52 ` Jeff King
2014-11-12 10:59 ` Jeff King
2014-11-12 16:17 ` Junio C Hamano
2014-11-10 21:44 ` Junio C Hamano [this message]
2014-11-11 3:11 ` Jeff King
2014-11-10 14:38 ` [PATCH v2 2/2] Add a few more options for receive.denyCurrentBranch Johannes Schindelin
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=xmqqbnoe91dz.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox