From: Isabella Stephens <istephens@atlassian.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: szeder.dev@gmail.com, git@vger.kernel.org,
sunshine@sunshineco.com, peff@peff.net, bturner@atlassian.com,
jacob.keller@gmail.com
Subject: Re: [PATCH v3] blame: prevent error if range ends past end of file
Date: Fri, 27 Oct 2017 17:18:20 +1100 [thread overview]
Message-ID: <926900b8-1aad-b02a-b3c6-2bc4930233fd@atlassian.com> (raw)
In-Reply-To: <xmqqzi8dcpx1.fsf@gitster.mtv.corp.google.com>
On 27/10/17 12:58 pm, Junio C Hamano wrote:
> Isabella Stephens <istephens@atlassian.com> writes:
>
>> diff --git a/builtin/blame.c b/builtin/blame.c
>> index 67adaef4d..b5b9db147 100644
>> --- a/builtin/blame.c
>> +++ b/builtin/blame.c
>> @@ -878,13 +878,13 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
>> nth_line_cb, &sb, lno, anchor,
>> &bottom, &top, sb.path))
>> usage(blame_usage);
>> - if (lno < top || ((lno || bottom) && lno < bottom))
>> + if ((lno || bottom) && lno < bottom)
>> die(Q_("file %s has only %lu line",
>> "file %s has only %lu lines",
>> lno), path, lno);
>> if (bottom < 1)
>> bottom = 1;
>> - if (top < 1)
>> + if (top < 1 || lno < top)
>> top = lno;
>
> This section sanity-checks first and then tweaks the values it
> allowed to pass the check. Because it wants to later fix up an
> overly large "top" by capping to "lno" (i.e. total line number), the
> patch needs to loosen the early sanity-check. And the "fixed up"
> values are never checked if they are sane.
>
> For example, with an empty file (i.e. lno == 0), you can ask "git
> blame -L1,-4 ("i.e. "at most four lines, ending at line #1") and the
> code silently accepts the input without noticing that the request is
> an utter nonsense; "file X has only 0 lines" error is given a chance
> to kick in.
>
> There should be an "is the range sensible?" check after all the
> tweaking to bottom and top are done, I think.
My mistake. I missed that case. I think this section of code is a little
hard to read because it avoids treating an empty file as a special case.
Why not do something like this:
for (range_i = 0; range_i < range_list.nr; ++range_i) {
long bottom, top;
if (!lno)
die(_("file is empty"));
if (parse_range_arg(range_list.items[range_i].string,
nth_line_cb, &sb, lno, anchor,
&bottom, &top, sb.path))
usage(blame_usage);
if (bottom < 1)
bottom = 1;
if (lno < top)
top = lno;
if (top < 0 || lno < bottom)
die(Q_("file %s has only %lu line",
"file %s has only %lu lines",
lno), path, lno);
bottom--;
range_set_append_unsafe(&ranges, bottom, top);
anchor = top + 1;
We'd also need to change parse_range_arg to always make bottom less than top:
- if (*begin && *end && *end < *begin) {
+ if (*end < *begin) {
SWAP(*end, *begin);
}
This also fixes the case where the given range is n,-(n+1) (e.g. -L1,-2). At
the moment that will blame from n to the end of the file. My suggested change
would instead blame the first n lines, which makes a lot more sense IMO.
Happy to leave as is if you aren't happy with this suggestion, however.
next prev parent reply other threads:[~2017-10-27 6:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-26 2:19 [PATCH] blame: add --fuzzy-lines command line option Isabella Stephens
2017-10-26 6:15 ` Junio C Hamano
2017-10-26 7:01 ` [PATCH v2] blame: prevent error if range ends past end of file Isabella Stephens
2017-10-26 8:48 ` Jacob Keller
2017-10-26 22:50 ` Isabella Stephens
2017-10-26 15:31 ` SZEDER Gábor
2017-10-26 23:37 ` Isabella Stephens
2017-10-27 0:56 ` [PATCH v3] " Isabella Stephens
2017-10-27 1:58 ` Junio C Hamano
2017-10-27 2:01 ` Junio C Hamano
2017-10-27 6:18 ` Isabella Stephens [this message]
2017-10-27 6:56 ` Eric Sunshine
2018-04-26 7:45 ` [PATCH v4 0/2] blame and log: " istephens
2018-04-26 7:45 ` [PATCH v4 1/2] blame: " istephens
2018-04-27 0:50 ` Junio C Hamano
2018-04-27 1:42 ` Isabella Stephens
2018-04-27 2:09 ` Junio C Hamano
2018-04-27 4:15 ` Isabella Stephens
2018-05-02 2:47 ` Junio C Hamano
2018-05-29 5:30 ` [PATCH v5 0/2] blame and log: " istephens
2018-05-29 5:30 ` [PATCH] blame: " istephens
2018-05-30 8:45 ` Eric Sunshine
2018-05-31 5:07 ` Isabella Stephens
2018-05-29 5:30 ` [PATCH] log: prevent error if line " istephens
2018-05-30 8:59 ` Eric Sunshine
2018-04-26 7:45 ` [PATCH v4 2/2] " istephens
2017-10-26 7:08 ` [PATCH] blame: add --fuzzy-lines command line option Isabella Stephens
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=926900b8-1aad-b02a-b3c6-2bc4930233fd@atlassian.com \
--to=istephens@atlassian.com \
--cc=bturner@atlassian.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@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.
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).