Fix warning in t/54taint.t with explicitly unset PERL5LIB (RT#91972)

diff --git a/Changes b/Changes
index 2a81172..1b69b27 100644 (file)
--- a/Changes
+++ b/Changes
@@ -33,6 +33,7 @@ Revision history for DBIx::Class
           relationship.
         - Fix t/storage/replicated.t class loading problem
         - Stop using the deprecated Class::MOP::load_class()
+        - Fix warning in t/54taint.t with explicitly unset PERL5LIB (RT#91972)
 
     * Misc
         - Replace $row with $result in all docs to be consistent and to

diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm
index 8dfb44b..3b17116 100644 (file)
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@ -540,6 +540,8 @@ yrlnry: Mark Jason Dominus <mjd@plover.com>
 
 zamolxes: Bogdan Lucaciu <bogdan@wiz.ro>
 
+Zefram: Andrew Main <zefram@fysh.org>
+
 =head1 COPYRIGHT
 
 Copyright (c) 2005 - 2011 the DBIx::Class L</AUTHOR> and L</CONTRIBUTORS>

diff --git a/t/54taint.t b/t/54taint.t
index 573e3c0..5db9193 100644 (file)
--- a/t/54taint.t
+++ b/t/54taint.t
@@ -12,7 +12,7 @@ use warnings;
 use Config;
 BEGIN {
   for (map { defined $ENV{$_} ? $ENV{$_} : () } (qw/PERLLIB PERL5LIB/) ) {  # we unshift, so reverse precedence
-    my ($envvar) = ($_ =~ /^(.+)$/);  # untaint
+    my ($envvar) = ($_ =~ /^(.*)$/s);  # untaint
     unshift @INC, map { length($_) ? $_ : () } (split /\Q$Config{path_sep}\E/, $envvar);
   }
 }