[SCM] Debian packaging of libdata-formvalidator-perl branch, squeeze, updated. 78a3154d35edb9390ce0ae3b4c08f6e78568da9f

[gregor herrmann]

The following commit has been merged in the squeeze branch:
commit 0b9d934de5162c652be581ddd4f0d87a4bf867b3
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Dec 16 20:32:38 2011 +0100

    apply the patch directly, remove debian/patches
    
    Git-Dch: Ignore

diff --git a/debian/patches/fix-re-when-untainting.patch b/debian/patches/fix-re-when-untainting.patch
deleted file mode 100644
index 931e832..0000000
--- a/debian/patches/fix-re-when-untainting.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix a matching check leading to passing (and mangling) invalid data
- $match would be '' when $val doesn't match $re and '' is still defined...
-Origin: vendor
-Bug: https://rt.cpan.org/Ticket/Display.html?id=61792
-Bug-Debian: http://bugs.debian.org/629511
-Forwarded: yes
-Author: Damyan Ivanov <dmn at debian.org>
-Last-Update: 2011-06-07
-
---- a/lib/Data/FormValidator/Results.pm
-+++ b/lib/Data/FormValidator/Results.pm
-@@ -807,7 +807,7 @@ sub _create_sub_from_RE {
-             # With methods, the value is the second argument
-             my $val = $force_method_p ? $_[1] : $_[0];
-             my ($match) = scalar ($val =~ $re);
--            if ($untaint_this && defined $match) {
-+            if ($untaint_this && $match) {
-                 # pass the value through a RE that matches anything to untaint it.
-                 my ($untainted) = ($&  =~ m/(.*)/s);
-                 return $untainted;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f286598..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-re-when-untainting.patch
diff --git a/lib/Data/FormValidator/Results.pm b/lib/Data/FormValidator/Results.pm
index e4902ec..edf6839 100644
--- a/lib/Data/FormValidator/Results.pm
+++ b/lib/Data/FormValidator/Results.pm
@@ -807,7 +807,7 @@ sub _create_sub_from_RE {
             # With methods, the value is the second argument
             my $val = $force_method_p ? $_[1] : $_[0];
             my ($match) = scalar ($val =~ $re);
-            if ($untaint_this && defined $match) {
+            if ($untaint_this && $match) {
                 # pass the value through a RE that matches anything to untaint it.
                 my ($untainted) = ($&  =~ m/(.*)/s);
                 return $untainted;

-- 
Debian packaging of libdata-formvalidator-perl