Bug 297928: detaint_natural, detaint_signed and trick_taint shouldn't rely on $1...

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 4dc64fe9487341dbac825b7fc49ab72926eaad4c..91e66f9f85325ea130b086a990193fa8144fa5f3 100644 (file)
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -59,20 +59,20 @@ sub is_tainted {
 sub trick_taint {
     require Carp;
     Carp::confess("Undef to trick_taint") unless defined $_[0];
-    $_[0] =~ /^(.*)$/s;
-    $_[0] = $1;
+    my ($match) = $_[0] =~ /^(.*)$/s;
+    $_[0] = $match;
     return (defined($_[0]));
 }
 
 sub detaint_natural {
-    $_[0] =~ /^(\d+)$/;
-    $_[0] = $1;
+    my ($match) = $_[0] =~ /^(\d+)$/;
+    $_[0] = $match;
     return (defined($_[0]));
 }
 
 sub detaint_signed {
-    $_[0] =~ /^([-+]?\d+)$/;
-    $_[0] = $1;
+    my ($match) = $_[0] =~ /^([-+]?\d+)$/;
+    $_[0] = $match;
     # Remove any leading plus sign.
     if (defined($_[0]) && $_[0] =~ /^\+(\d+)$/) {
         $_[0] = $1;