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

* jm/maint-1.6.5-grep-NUL-terminate: grep: NUL terminate input from a file
git-mirror · Jan 20, 2010 · 27132ca · 27132ca
2 parents 03c6e97 + 34f3999
commit 27132ca
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/builtin-grep.c b/builtin-grep.c
@@ -207,6 +207,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);