log: fix -L bounds checking bug

sunshineco · gitster · commit 63828b844d17 · 2013-08-05T11:54:32.000-07:00
When 12da1d1 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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git 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
@@ -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
 '

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ test_expect_success '-L X (X == nlines)' '`
`69`	`69`	`git log -L $n:b.c`
`70`	`70`	`'`
`71`	`71`
`72`		`-test_expect_failure '-L X (X == nlines + 1)' '`
	`72`	`+test_expect_success '-L X (X == nlines + 1)' '`
`73`	`73`	`n=$(expr $(wc -l <b.c) + 1) &&`
`74`	`74`	`test_must_fail git log -L $n:b.c`
`75`	`75`	`'`