summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-03 21:03:25 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-03 21:03:25 -0700
commit7ed36f56e33bd838d06521a37a916516397e9e8b (patch)
tree6f672da4064f192e2dff91180f1f24fabb591b58
parentbuiltin-grep: tighten path wildcard vs tree traversal. (diff)
downloadtgif-7ed36f56e33bd838d06521a37a916516397e9e8b.tar.xz
builtin-grep: terminate correctly at EOF
It barfed and segfaulted with an incomplete line. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--builtin-grep.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-grep.c b/builtin-grep.c
index 2124fa62e8..e87b5cb48d 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -264,6 +264,8 @@ static int grep_buffer(struct grep_opt *opt, const char *name,
}
*eol = ch;
bol = eol + 1;
+ if (!left)
+ break;
left--;
lno++;
}