[PATCH 2/2] gitweb: Harden "grep" search against filenames with ':'
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Jan 5, 2012, 20:32 UTC
- Message-ID
- <201201052132.56581.jnareb@gmail.com>
- In-Reply-To
- <201201052126.49087.jnareb@gmail.com>
Run "git grep" in "grep" search with '-z' option, to be able to parse response also for files with filename containing ':' character. The ':' character is otherwise (without '-z') used to separate filename from line number and from matched line.
Note that this does not protect files with filename containing embedded newline. This would be hard but doable for text files, and harder or even currently impossible with binary files: git does not quote filename in
"Binary file <foo> matches"
message, but new `--break` and/or `--header` options to git-grep could help here.
Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- This is what I did after fixing previous issue, after looking at current code. Hopefully nobody sane uses filenames with embedded newlines...
http://www.dwheeler.com/essays/fixing-unix-linux-filenames.html
gitweb/gitweb.perl | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index fa58156..f884dfe 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -5836,7 +5836,7 @@ sub git_search_files { my %co = @_; local $/ = "\n"; - open my $fd, "-|", git_cmd(), 'grep', '-n', + open my $fd, "-|", git_cmd(), 'grep', '-n', '-z', $search_use_regexp ? ('-E', '-i') : '-F', $searchtext, $co{'tree'} or die_error(500, "Open git-grep failed"); @@ -5858,7 +5858,8 @@ sub git_search_files { $file = $1; $binary = 1; } else { - (undef, $file, $lno, $ltext) = split(/:/, $line, 4); + ($file, $lno, $ltext) = split(/\0/, $line, 3); + $file =~ s/^$co{'tree'}://; } if ($file ne $lastfile) { $lastfile and print "</td></tr>\n";
-- 1.7.6