gitweb: Harden "grep" search against filenames with ':'

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 <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/gitweb.perl b/gitweb.perl
index 1cfb8ae525e97f0a86c13ee2c079b967b400b2bb7f5ed441f0fb6a1363ee79fb..4ba6554fbdb699ec66050b4682ce90111ad0480c712d607c7ab7df4d2becda26 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -5837,7 +5837,7 @@ sub git_search_files {
        my %co = @_;
 
        local $/ = "\n";
        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");
                $search_use_regexp ? ('-E', '-i') : '-F',
                $searchtext, $co{'tree'}
                        or die_error(500, "Open git-grep failed");


@@ -5859,7 +5859,8 @@ sub git_search_files {
                        $file = $1;
                        $binary = 1;
                } else {
                        $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";
                }
                if ($file ne $lastfile) {
                        $lastfile and print "</td></tr>\n";