X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=blobdiff_plain;f=lib%2FConfig%2FAny%2FPerl.pm;h=3e27a17b4115d17435f6e433d1abecb9fcdc7ab5;hp=2798d87e09a845c50be0f1f85e7c61c9e1de6d9e;hb=c63419999f2c029f35bfcd700ae196eb0a3a08fa;hpb=dcfb1d1d1a544d27a82cb174168df23abc539acb

diff --git a/lib/Config/Any/Perl.pm b/lib/Config/Any/Perl.pm
index 2798d87..3e27a17 100644
--- a/lib/Config/Any/Perl.pm
+++ b/lib/Config/Any/Perl.pm
@@ -4,8 +4,8 @@ use strict;
 use warnings;
 
 use base 'Config::Any::Base';
-
-my %cache;
+use File::Spec;
+use Cwd ();
 
 =head1 NAME
 
@@ -46,12 +46,19 @@ Attempts to load C<$file> as a Perl file.
 sub load {
     my $class = shift;
     my $file  = shift;
-    my $content;
 
-    unless ( $content = $cache{ $file } ) {
-        $content = require $file;
-        $cache{ $file } = $content;
+    my( $exception, $content );
+    {
+        local $@;
+        # previously this would load based on . being in @INC, and wouldn't
+        # trigger taint errors even if '.' probably should have been considered
+        # tainted.  untaint for backwards compatibility.
+        my ($cwd) = Cwd::cwd() =~ /\A(.*)\z/s;
+        $content = do File::Spec->rel2abs($file, $cwd);
+        $exception = $@ || $!
+            if !defined $content;
     }
+    die $exception if $exception;
 
     return $content;
 }
@@ -62,7 +69,7 @@ Brian Cassidy E<lt>bricas@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2007 by Brian Cassidy
+Copyright 2006-2016 by Brian Cassidy
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.