mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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
This commit is contained in:
commit
7d0dafe394
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue