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

gitster · gitster · commit 7d0dafe39454 · 2010-01-18T17:03:34.000-08:00
* jm/maint-1.6.5-grep-NUL-terminate:
  grep: NUL terminate input from a file
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);

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,7 @@ static int grep_file(struct grep_opt opt, const char filename)`
`205`	`205`	`return 0;`
`206`	`206`	`}`
`207`	`207`	`close(i);`
	`208`	`+ data[sz] = 0;`
`208`	`209`	`if (opt->relative && opt->prefix_length)`
`209`	`210`	`filename = quote_path_relative(filename, -1, &buf, opt->prefix);`
`210`	`211`	`i = grep_buffer(opt, filename, data, sz);`