undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* jm/maint-1.6.5-grep-NUL-terminate:
  grep: NUL terminate input from a file
This commit is contained in:
Junio C Hamano 2010-01-20 12:16:46 -08:00
commit 27132ca85a
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin-grep.c
View File

@ -207,6 +207,7 @@ static int grep_file(struct grep_opt *opt, const char *filename)
return 0; return 0;
} }
close(i); close(i);
data[sz] = 0;
if (opt->relative && opt->prefix_length) if (opt->relative && opt->prefix_length)
filename = quote_path_relative(filename, -1, &buf, opt->prefix); filename = quote_path_relative(filename, -1, &buf, opt->prefix);
i = grep_buffer(opt, filename, data, sz); i = grep_buffer(opt, filename, data, sz);