Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint

* jm/maint-1.6.5-grep-NUL-terminate: grep: NUL terminate input from a file
git-mirror · Jan 19, 2010 · 7d0dafe · 7d0dafe
2 parents b9cb077 + 34f3999
commit 7d0dafe
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/builtin-grep.c b/builtin-grep.c
@@ -205,6 +205,7 @@ static int grep_file(struct grep_opt *opt, const char *filename)
 		return 0;
 	}
 	close(i);
+	data[sz] = 0;
 	if (opt->relative && opt->prefix_length)
 		filename = quote_path_relative(filename, -1, &buf, opt->prefix);
 	i = grep_buffer(opt, filename, data, sz);