development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

blame: prevent a segv when -L given start > EOF

Browse source 
blame would segv if given -L <lineno> with <lineno> past the end of the file.
While we're fixing the bug, add test cases for an invalid <start> when called
as -L <start>,<end> or -L<start>.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jay Soffian 2010-02-08 22:48:13 -05:00 committed by Junio C Hamano
parent 153559a964
commit 92f9e273e8
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin-blame.c
View file

@ -2432,7 +2432,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
if (top < 1) if (top < 1)
top = lno; top = lno;
bottom--; bottom--;
if (lno < top) if (lno < top || lno < bottom)
die("file %s has only %lu lines", path, lno); die("file %s has only %lu lines", path, lno);
ent = xcalloc(1, sizeof(*ent)); ent = xcalloc(1, sizeof(*ent));

8
t/t8003-blame.sh
View file

@ -157,4 +157,12 @@ EOF
git --no-pager blame $COMMIT -- uno >/dev/null git --no-pager blame $COMMIT -- uno >/dev/null
' '
test_expect_success 'blame -L with invalid start' '
test_must_fail git blame -L5 tres 2>&1 | grep "has only 2 lines"
'
test_expect_success 'blame -L with invalid end' '
git blame -L1,5 tres 2>&1 | grep "has only 2 lines"
'
test_done test_done