From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: git@vger•kernel.org
Subject: Re: What's cooking in git.git (Apr 2014, #08; Fri, 25)
Date: Mon, 28 Apr 2014 10:48:21 -0700 [thread overview]
Message-ID: <xmqqa9b5s5ui.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140425231953.GB3855@sigill.intra.peff.net> (Jeff King's message of "Fri, 25 Apr 2014 19:19:54 -0400")
Jeff King <peff@peff•net> writes:
> On Fri, Apr 25, 2014 at 03:50:26PM -0700, Junio C Hamano wrote:
>
>> * jk/external-diff-use-argv-array (2014-04-21) 6 commits
>> (merged to 'next' on 2014-04-22 at e6d92d7)
>> + run_external_diff: refactor cmdline setup logic
>> + run_external_diff: hoist common bits out of conditional
>> + run_external_diff: drop fflush(NULL)
>> + run_external_diff: clean up error handling
>> + run_external_diff: use an argv_array for the environment
>> + run_external_diff: use an argv_array for the command line
>>
>> Code clean-up.
>>
>> Will keep in 'next' for the remainder of the cycle.
>
> The first one does fix a possible stack overflow (albeit of one NULL,
> not arbitrary content, so I don't think it's exploitable). We may want
> to do:
>
> diff --git a/diff.c b/diff.c
> index 54d5308..a03744b 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -2894,7 +2894,7 @@ static void run_external_diff(const char *pgm,
> int complete_rewrite,
> struct diff_options *o)
> {
> - const char *spawn_arg[10];
> + const char *spawn_arg[11];
> int retval;
> const char **arg = &spawn_arg[0];
> struct diff_queue_struct *q = &diff_queued_diff;
>
> as a fix for maint/2.0.0 in the interim. I can write a commit message
> for that if you're interested.
I think we should merge the first one (and possibly the second one,
too) as-is for 2.0 instead. No change can possibly be more
trivially correct than these two ;-)
next prev parent reply other threads:[~2014-04-28 19:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-25 22:50 What's cooking in git.git (Apr 2014, #08; Fri, 25) Junio C Hamano
2014-04-25 23:19 ` Jeff King
2014-04-26 1:36 ` Felipe Contreras
2014-04-26 2:43 ` Alex Davidson
2014-04-26 6:04 ` Felipe Contreras
2014-04-26 9:39 ` Philip Oakley
2014-04-26 19:35 ` Felipe Contreras
2014-04-26 4:25 ` Jeff King
2014-04-28 17:48 ` Junio C Hamano [this message]
2014-04-28 18:01 ` Jeff King
2014-05-09 16:53 ` Michael Haggerty
2014-05-09 17:07 ` Felipe Contreras
2014-05-09 17:51 ` Philip Oakley
2014-05-12 21:05 ` Jeff King
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=xmqqa9b5s5ui.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--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