Skip to content

Commit

Permalink
t8001/t8002: blame: demonstrate -L bounds checking bug
Browse files Browse the repository at this point in the history
A bounds checking bug allows the X in -LX to extend one line past the
end of file. For example, given a file with 5 lines, -L6 is accepted as
valid. Demonstrate this problem.

While here, also add tests to check that the remaining cases of X and Y
in -LX,Y are handled correctly at and in the vicinity of end-of-file.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Eric Sunshine authored and Junio C Hamano committed Aug 5, 2013
1 parent f350cf9 commit 580b4f3
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions t/annotate-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,32 @@ test_expect_success 'blame -L /RE/,-N' '
check_count -L/99/,-3 B 1 B2 1 D 1
'

# 'file' ends with an incomplete line, so 'wc' reports one fewer lines than
# git-blame sees, hence the last line is actually $(wc...)+1.
test_expect_success 'blame -L X (X == nlines)' '
n=$(expr $(wc -l <file) + 1) &&
check_count -L$n C 1
'

test_expect_failure 'blame -L X (X == nlines + 1)' '
n=$(expr $(wc -l <file) + 2) &&
test_must_fail $PROG -L$n file
'

test_expect_success 'blame -L X (X > nlines)' '
test_must_fail $PROG -L12345 file
'

test_expect_success 'blame -L ,Y (Y == nlines)' '
n=$(expr $(wc -l <file) + 1) &&
check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
'

test_expect_success 'blame -L ,Y (Y == nlines + 1)' '
n=$(expr $(wc -l <file) + 2) &&
test_must_fail $PROG -L,$n file
'

test_expect_success 'blame -L ,Y (Y > nlines)' '
test_must_fail $PROG -L,12345 file
'
Expand Down

0 comments on commit 580b4f3

Please sign in to comment.