From 63828b844d17d66d18c19375c559ab8678693f97 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Wed, 31 Jul 2013 04:15:41 -0400 Subject: [PATCH] log: fix -L bounds checking bug 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 Signed-off-by: Junio C Hamano --- 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 c2d01dccc2..1c3ac8dccd 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 769ac686c3..b01b3ddebb 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