diff options
| author |  Eric Sunshine <sunshine@sunshineco.com> | 2013-07-31 04:15:38 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-08-05 11:54:31 -0700 |
| commit | 164a9cf4303d4a8e5c969e057adf9d700468ddc5 (patch) | |
| tree | 09b5f9aa921aa81bc53253b73117acca618c0e9c /builtin/blame.c | |
| parent | t8001/t8002: blame: add empty file & partial-line tests (diff) | |
| download | tgif-164a9cf4303d4a8e5c969e057adf9d700468ddc5.tar.xz | |
blame: fix -L bounds checking bug
Since inception, -LX,Y has correctly reported an out-of-range error when
Y is beyond end of file, however, X was not checked, and an out-of-range
X would cause a crash. 92f9e273 (blame: prevent a segv when -L given
start > EOF; 2010-02-08) attempted to rectify this shortcoming but has
its own off-by-one error which allows X to extend one line past end of
file. For example, given a file with 5 lines:
git blame -L5 foo # OK, blames line 5
git blame -L6 foo # accepted, no error, no output, huh?
git blame -L7 foo # error "fatal: file foo has only 5 lines"
Fix this bug.
In order to avoid regressing "blame foo" when foo is an empty file, the
fix is slightly more complicated than changing '<' to '<='.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/blame.c')
| -rw-r--r-- | builtin/blame.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 079dcd3407..e70b089a67 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2495,13 +2495,13 @@ parse_done: bottom = top = 0; if (bottomtop) prepare_blame_range(&sb, bottomtop, lno, &bottom, &top); + if (lno < top || ((lno || bottom) && lno < bottom)) + die("file %s has only %lu lines", path, lno); if (bottom < 1) bottom = 1; if (top < 1) top = lno; bottom--; - if (lno < top || lno < bottom) - die("file %s has only %lu lines", path, lno); ent = xcalloc(1, sizeof(*ent)); ent->lno = bottom; |