From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Sam Kuper <sam.kuper@uclmail.net>,
git@vger.kernel.org
Subject: Re: Bug report: "Use of uninitialized value $_ in print"
Date: Fri, 2 Mar 2018 11:55:43 -0500 [thread overview]
Message-ID: <20180302165543.GA4616@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqq1sh2e7w1.fsf@gitster-ct.c.googlers.com>
On Fri, Mar 02, 2018 at 08:53:34AM -0800, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > Because the array is full of "undef". See parse_diff(), which does this:
> >
> > my @diff = run_cmd_pipe("git", @diff_cmd, "--", $path);
> > ...
> > @colored = run_cmd_pipe(@display_cmd);
> > ...
> > for (my $i = 0; $i < @diff; $i++) {
> > ...
> > push @{$hunk[-1]{TEXT}}, $diff[$i];
> > push @{$hunk[-1]{DISPLAY}},
> > (@colored ? $colored[$i] : $diff[$i]);
> > }
> >
> > If the @colored output is shorter than the normal @diff output, we'll
> > push a bunch of "undef" onto the DISPLAY array (the ternary there is
> > because sometimes @colored is completely empty if the user did not ask
> > for color).
>
> An obvious sanity check would be to ensure @colored == @diff
>
> push @{$hunk[-1]{DISPLAY}},
> - (@colored ? $colored[$i] : $diff[$i]);
> + (@colored && @colored == @diff ? $colored[$i] : $diff[$i]);
> }
>
> or something like that?
That's probably a reasonable sanity check, but I think we need to abort
and not just have a too-small DISPLAY array. Because later code like the
hunk-splitting is going to assume that there's a 1:1 line
correspondence. We definitely don't want to end up in a situation where
we show one thing but apply another.
-Peff
next prev parent reply other threads:[~2018-03-02 16:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-02 1:19 Bug report: "Use of uninitialized value $_ in print" Sam Kuper
2018-03-02 7:04 ` Jonathan Nieder
2018-03-02 10:46 ` Jeff King
2018-03-02 16:53 ` Junio C Hamano
2018-03-02 16:55 ` Jeff King [this message]
2018-03-02 17:15 ` Junio C Hamano
2018-03-03 5:57 ` Jeff King
2018-03-03 5:58 ` [PATCH 1/2] t3701: add a test for interactive.diffFilter Jeff King
2018-03-03 5:58 ` [PATCH 2/2] add--interactive: detect bogus diffFilter output Jeff King
2018-03-05 20:53 ` Junio C Hamano
2018-03-05 20:56 ` Jeff King
2018-03-05 21:33 ` Ævar Arnfjörð Bjarmason
2018-03-05 22:09 ` Junio C Hamano
2018-03-05 22:15 ` Ævar Arnfjörð Bjarmason
2018-03-05 21:54 ` Bug report: "Use of uninitialized value $_ in print" Jonathan Nieder
2018-03-02 17:28 ` Sam Kuper
2018-03-02 10:42 ` Jeff King
2018-03-02 17:30 ` Sam Kuper
2018-03-03 6:02 ` Jeff King
2018-03-02 17:48 ` Junio C Hamano
2018-03-02 20:34 ` Sam Kuper
2018-03-02 21:53 ` Junio C Hamano
2018-03-03 6:18 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180302165543.GA4616@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sam.kuper@uclmail.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).