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 07/11] log: fix -L bounds checking bug
Date: Wed, 31 Jul 2013 04:15:41 -0400 [thread overview]
Message-ID: <1375258545-42240-8-git-send-email-sunshine@sunshineco.com> (raw)
In-Reply-To: <1375258545-42240-1-git-send-email-sunshine@sunshineco.com>
When 12da1d1f added -L support to git-log, a broken bounds check was
copied from git-blame -L which incorrectly allows -LX to extend one line
past end of file without reporting an error. Instead, it generates an
empty range. Fix this bug.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---
line-log.c | 4 ++--
t/t4211-line-log.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/line-log.c b/line-log.c
index c2d01dc..1c3ac8d 100644
--- a/line-log.c
+++ b/line-log.c
@@ -594,13 +594,13 @@ parse_lines(struct commit *commit, const char *prefix, struct string_list *args)
lines, &begin, &end,
full_name))
die("malformed -L argument '%s'", range_part);
+ if (lines < end || ((lines || begin) && lines < begin))
+ die("file %s has only %lu lines", name_part, lines);
if (begin < 1)
begin = 1;
if (end < 1)
end = lines;
begin--;
- if (lines < end || lines < begin)
- die("file %s has only %ld lines", name_part, lines);
line_log_data_insert(&ranges, full_name, begin, end);
free_filespec(spec);
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 769ac68..b01b3dd 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -69,7 +69,7 @@ test_expect_success '-L X (X == nlines)' '
git log -L $n:b.c
'
-test_expect_failure '-L X (X == nlines + 1)' '
+test_expect_success '-L X (X == nlines + 1)' '
n=$(expr $(wc -l <b.c) + 1) &&
test_must_fail git log -L $n:b.c
'
--
1.8.3.4.1120.gc240c48
next prev parent reply other threads:[~2013-07-31 8:17 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 ` [PATCH 04/11] blame: fix -L bounds checking bug Eric Sunshine
2013-07-31 8:15 ` [PATCH 05/11] t4211: log: demonstrate " Eric Sunshine
2013-07-31 8:15 ` [PATCH 06/11] t4211: retire soon-to-be unimplementable tests Eric Sunshine
2013-07-31 8:15 ` Eric Sunshine [this message]
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-8-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).