aboutsummaryrefslogtreecommitdiff
path: root/builtin-blame.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-08 21:53:54 -0800
committerJunio C Hamano <gitster@pobox.com>2010-02-08 21:53:54 -0800
commite33cc592deae8132936eea119554799e1039bc0f (patch)
treede03ec4e298bf23e73f7789a4f00cad2385ff756 /builtin-blame.c
parenta598331f952b5bd89f72fcf20a44ab3aa2918b3f (diff)
parent92f9e273e86d505e4c2a28bc053eb514ca2cc552 (diff)
downloadgit-e33cc592deae8132936eea119554799e1039bc0f.tar.gz
git-e33cc592deae8132936eea119554799e1039bc0f.tar.xz
Merge branch 'maint-1.6.5' into maint
* maint-1.6.5: blame: prevent a segv when -L given start > EOF
Diffstat (limited to 'builtin-blame.c')
-rw-r--r--builtin-blame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-blame.c b/builtin-blame.c
index 6408ec8ee..10f7eacf6 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -2433,7 +2433,7 @@ parse_done:
if (top < 1)
top = lno;
bottom--;
- if (lno < top)
+ if (lno < top || lno < bottom)
die("file %s has only %lu lines", path, lno);
ent = xcalloc(1, sizeof(*ent));