summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-01 22:44:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-01 22:44:38 (GMT)
commit6a3a3db73f999af530490868c005f70d62d3391f (patch)
tree0d4363d119cb0e1625e4769de04da65ad22a1ffe /gitweb
parent57a424917b0c08c91399c5de311b642bf19a77ee (diff)
parent36612e4daf8b5b5eaf16315aa13c66925f878cd6 (diff)
downloadgit-6a3a3db73f999af530490868c005f70d62d3391f.zip
git-6a3a3db73f999af530490868c005f70d62d3391f.tar.gz
git-6a3a3db73f999af530490868c005f70d62d3391f.tar.bz2
Merge branch 'jn/maint-gitweb-invalid-regexp'
* jn/maint-gitweb-invalid-regexp: gitweb: Handle invalid regexp in regexp search
Diffstat (limited to 'gitweb')
-rwxr-xr-xgitweb/gitweb.perl11
1 files changed, 10 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index eaf5f94..7729ed2 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -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;
+ }
}
}