summaryrefslogtreecommitdiffstats
path: root/Bugzilla/DB
diff options
context:
space:
mode:
authordkl%redhat.com <>2008-06-20 01:06:27 +0200
committerdkl%redhat.com <>2008-06-20 01:06:27 +0200
commitc34003dcdd1cc0705c5464164f7d4dfd52d6d3d6 (patch)
treed2ba25b4d2c2796f75c6044fb4a9bbc32009e204 /Bugzilla/DB
parentf575fab32dc8679c3fa69bf38b7017049285b42c (diff)
downloadbugzilla-c34003dcdd1cc0705c5464164f7d4dfd52d6d3d6.tar.gz
bugzilla-c34003dcdd1cc0705c5464164f7d4dfd52d6d3d6.tar.xz
Bug 157092 – Implement a checking mechanism for invalid regexp
Patch by David Lawrence <dkl@redhat.com> - r/a=mkanat
Diffstat (limited to 'Bugzilla/DB')
-rw-r--r--Bugzilla/DB/Mysql.pm8
-rw-r--r--Bugzilla/DB/Oracle.pm8
-rw-r--r--Bugzilla/DB/Pg.pm8
3 files changed, 18 insertions, 6 deletions
diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index 8bca06f4c..80f1cd793 100644
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -104,13 +104,17 @@ sub bz_last_key {
}
sub sql_regexp {
- my ($self, $expr, $pattern) = @_;
+ my ($self, $expr, $pattern, $nocheck) = @_;
+
+ $self->bz_check_regexp($pattern) if !$nocheck;
return "$expr REGEXP $pattern";
}
sub sql_not_regexp {
- my ($self, $expr, $pattern) = @_;
+ my ($self, $expr, $pattern, $nocheck) = @_;
+
+ $self->bz_check_regexp($pattern) if !$nocheck;
return "$expr NOT REGEXP $pattern";
}
diff --git a/Bugzilla/DB/Oracle.pm b/Bugzilla/DB/Oracle.pm
index 9f759785e..1387a45cb 100644
--- a/Bugzilla/DB/Oracle.pm
+++ b/Bugzilla/DB/Oracle.pm
@@ -95,13 +95,17 @@ sub bz_last_key {
}
sub sql_regexp {
- my ($self, $expr, $pattern) = @_;
+ my ($self, $expr, $pattern, $nocheck) = @_;
+
+ $self->bz_check_regexp($pattern) if !$nocheck;
return "REGEXP_LIKE($expr, $pattern)";
}
sub sql_not_regexp {
- my ($self, $expr, $pattern) = @_;
+ my ($self, $expr, $pattern, $nocheck) = @_;
+
+ $self->bz_check_regexp($pattern) if !$nocheck;
return "NOT REGEXP_LIKE($expr, $pattern)"
}
diff --git a/Bugzilla/DB/Pg.pm b/Bugzilla/DB/Pg.pm
index 4777ba89a..a6a2e3281 100644
--- a/Bugzilla/DB/Pg.pm
+++ b/Bugzilla/DB/Pg.pm
@@ -93,13 +93,17 @@ sub bz_last_key {
}
sub sql_regexp {
- my ($self, $expr, $pattern) = @_;
+ my ($self, $expr, $pattern, $nocheck) = @_;
+
+ $self->bz_check_regexp($pattern) if !$nocheck;
return "$expr ~* $pattern";
}
sub sql_not_regexp {
- my ($self, $expr, $pattern) = @_;
+ my ($self, $expr, $pattern, $nocheck) = @_;
+
+ $self->bz_check_regexp($pattern) if !$nocheck;
return "$expr !~* $pattern"
}