Merge branch 'maint-1.6.5' into maint

* maint-1.6.5: blame: prevent a segv when -L given start > EOF
git-mirror · Feb 9, 2010 · e33cc59 · e33cc59
2 parents a598331 + 92f9e27
commit e33cc59
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/builtin-blame.c b/builtin-blame.c
@@ -2433,7 +2433,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 	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));

diff --git a/t/t8003-blame.sh b/t/t8003-blame.sh
@@ -157,4 +157,12 @@ EOF
   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