mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/maint-gitweb-invalid-regexp'

Browse Source 
* jn/maint-gitweb-invalid-regexp:
  gitweb: Handle invalid regexp in regexp search
This commit is contained in:
Junio C Hamano
2012-03-01 14:44:38 -08:00
parent 57a424917b 36612e4daf
commit 6a3a3db73f
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gitweb/gitweb.perl
View File

@ -1081,7 +1081,16 @@ sub evaluate_and_validate_params {
if (length($searchtext) < 2) {
die_error(403, "At least two characters are required for search parameter");
}
$search_regexp = $search_use_regexp ? $searchtext : quotemeta $searchtext;
if ($search_use_regexp) {
$search_regexp = $searchtext;
if (!eval { qr/$search_regexp/; 1; }) {
(my $error = $@) =~ s/ at \S+ line \d+.*\n?//;
die_error(400, "Invalid search regexp '$search_regexp'",
esc_html($error));
}
} else {
$search_regexp = quotemeta $searchtext;
}
}
}