From: Eric Sunshine <sunshine@sunshineco.com>
To: git@vger.kernel.org
Cc: Eric Sunshine <sunshine@sunshineco.com>,
Junio C Hamano <gitster@pobox.com>,
Thomas Rast <trast@inf.ethz.ch>,
Bo Yang <struggleyb.nku@gmail.com>,
Johannes Sixt <j.sixt@viscovery.net>
Subject: [PATCH 04/11] blame: fix -L bounds checking bug
Date: Wed, 31 Jul 2013 04:15:38 -0400 [thread overview]
Message-ID: <1375258545-42240-5-git-send-email-sunshine@sunshineco.com> (raw)
In-Reply-To: <1375258545-42240-1-git-send-email-sunshine@sunshineco.com>
Since inception, -LX,Y has correctly reported an out-of-range error when
Y is beyond end of file, however, X was not checked, and an out-of-range
X would cause a crash. 92f9e273 (blame: prevent a segv when -L given
start > EOF; 2010-02-08) attempted to rectify this shortcoming but has
its own off-by-one error which allows X to extend one line past end of
file. For example, given a file with 5 lines:
git blame -L5 foo # OK, blames line 5
git blame -L6 foo # accepted, no error, no output, huh?
git blame -L7 foo # error "fatal: file foo has only 5 lines"
Fix this bug.
In order to avoid regressing "blame foo" when foo is an empty file, the
fix is slightly more complicated than changing '<' to '<='.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---
builtin/blame.c | 4 ++--
t/annotate-tests.sh | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c
index 079dcd3..e70b089 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2495,13 +2495,13 @@ parse_done:
bottom = top = 0;
if (bottomtop)
prepare_blame_range(&sb, bottomtop, lno, &bottom, &top);
+ if (lno < top || ((lno || bottom) && lno < bottom))
+ die("file %s has only %lu lines", path, lno);
if (bottom < 1)
bottom = 1;
if (top < 1)
top = lno;
bottom--;
- if (lno < top || lno < bottom)
- die("file %s has only %lu lines", path, lno);
ent = xcalloc(1, sizeof(*ent));
ent->lno = bottom;
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index f67332c..f117ef0 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -232,7 +232,7 @@ test_expect_success 'blame -L X (X == nlines)' '
check_count -L$n C 1
'
-test_expect_failure 'blame -L X (X == nlines + 1)' '
+test_expect_success 'blame -L X (X == nlines + 1)' '
n=$(expr $(wc -l <file) + 2) &&
test_must_fail $PROG -L$n file
'
@@ -321,7 +321,7 @@ test_expect_success 'blame -L 0 empty (undocumented)' '
check_count -h HEAD^^ -f incremental -L0
'
-test_expect_failure 'blame -L 1 empty' '
+test_expect_success 'blame -L 1 empty' '
test_must_fail $PROG -L1 incremental HEAD^^
'
@@ -341,7 +341,7 @@ test_expect_success 'blame -L 1 half' '
check_count -h HEAD^ -f incremental -L1 I 1
'
-test_expect_failure 'blame -L 2 half' '
+test_expect_success 'blame -L 2 half' '
test_must_fail $PROG -L2 incremental HEAD^
'
@@ -361,7 +361,7 @@ test_expect_success 'blame -L 1 full' '
check_count -f incremental -L1 I 1
'
-test_expect_failure 'blame -L 2 full' '
+test_expect_success 'blame -L 2 full' '
test_must_fail $PROG -L2 incremental
'
--
1.8.3.4.1120.gc240c48
next prev parent reply other threads:[~2013-07-31 8:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-31 8:15 [PATCH 00/11] blame/log -L: additional tests and bug fixes Eric Sunshine
2013-07-31 8:15 ` [PATCH 01/11] t8001/t8002: blame: decompose overly-large test Eric Sunshine
2013-07-31 8:15 ` [PATCH 02/11] t8001/t8002: blame: demonstrate -L bounds checking bug Eric Sunshine
2013-08-05 19:29 ` Junio C Hamano
2013-08-05 19:35 ` Eric Sunshine
2013-08-05 19:45 ` Eric Sunshine
2013-08-05 23:30 ` Junio C Hamano
2013-07-31 8:15 ` [PATCH 03/11] t8001/t8002: blame: add empty file & partial-line tests Eric Sunshine
2013-07-31 8:15 ` Eric Sunshine [this message]
2013-07-31 8:15 ` [PATCH 05/11] t4211: log: demonstrate -L bounds checking bug Eric Sunshine
2013-07-31 8:15 ` [PATCH 06/11] t4211: retire soon-to-be unimplementable tests Eric Sunshine
2013-07-31 8:15 ` [PATCH 07/11] log: fix -L bounds checking bug Eric Sunshine
2013-07-31 8:15 ` [PATCH 08/11] t8001/t8002: blame: demonstrate acceptance of bogus -LX,+0 and -LX,-0 Eric Sunshine
2013-07-31 8:15 ` [PATCH 09/11] blame: reject empty ranges " Eric Sunshine
2013-07-31 8:15 ` [PATCH 10/11] t8001/t8002: blame: demonstrate acceptance of bogus -L,+0 and -L,-0 Eric Sunshine
2013-07-31 8:15 ` [PATCH 11/11] blame: reject empty ranges " Eric Sunshine
2013-08-03 14:41 ` [PATCH 00/11] blame/log -L: additional tests and bug fixes Thomas Rast
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=1375258545-42240-5-git-send-email-sunshine@sunshineco.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=struggleyb.nku@gmail.com \
--cc=trast@inf.ethz.ch \
/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).