summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xPorting/Maintainers.pl2
-rw-r--r--cpan/Module-Load/lib/Module/Load.pm4
-rw-r--r--cpan/Module-Load/t/01_Module-Load.t1
-rw-r--r--pod/perldelta.pod11
4 files changed, 14 insertions, 4 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 9589d1b9a1..633f5d7bc8 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1267,7 +1267,7 @@ use File::Glob qw(:case);
'Module::Load' =>
{
'MAINTAINER' => 'kane',
- 'DISTRIBUTION' => 'BINGOS/Module-Load-0.20.tar.gz',
+ 'DISTRIBUTION' => 'BINGOS/Module-Load-0.22.tar.gz',
'FILES' => q[cpan/Module-Load],
'UPSTREAM' => 'cpan',
},
diff --git a/cpan/Module-Load/lib/Module/Load.pm b/cpan/Module-Load/lib/Module/Load.pm
index 7087b5e8bf..3a83c386a2 100644
--- a/cpan/Module-Load/lib/Module/Load.pm
+++ b/cpan/Module-Load/lib/Module/Load.pm
@@ -1,6 +1,6 @@
package Module::Load;
-$VERSION = '0.20';
+$VERSION = '0.22';
use strict;
use File::Spec ();
@@ -49,6 +49,8 @@ sub _to_file{
## trailing blanks ignored by default. [rt #69886]
my @parts = split /::/, $_, -1;
+ ## make sure that we can't hop out of @INC
+ shift @parts if @parts && !$parts[0];
### because of [perl #19213], see caveats ###
my $file = $^O eq 'MSWin32'
diff --git a/cpan/Module-Load/t/01_Module-Load.t b/cpan/Module-Load/t/01_Module-Load.t
index 0aaed74be0..228b31d7bd 100644
--- a/cpan/Module-Load/t/01_Module-Load.t
+++ b/cpan/Module-Load/t/01_Module-Load.t
@@ -17,6 +17,7 @@ use Test::More 'no_plan';
{ my @Map = (
# module flag diagnostic
[q|Must::Be::Loaded|, 1, 'module'],
+ [q|::Must::Be::Loaded|, 1, 'module'],
[q|LoadMe.pl|, 0, 'file' ],
[q|LoadIt|, 1, 'ambiguous module' ],
[q|ToBeLoaded|, 0, 'ambiguous file' ],
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 10d9fec035..0271444365 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -112,11 +112,18 @@ L<ExtUtils::MakeMaker> has been upgraded from version 6.59 to version 6.61_01.
=item *
-L<Unicode::Collate> has been upgraded from version 0.78 to version 0.79.
+L<ExtUtils::ParseXS> has been upgraded from version 3.04_04 to version 3.05.
=item *
-L<ExtUtils::ParseXS> has been upgraded from version 3.04_04 to version 3.05.
+L<Module::Load> has been upgraded from version 0.20 to version 0.22.
+
+Resolve possible security problem [http://goo.gl/YzHRU] where a '::' prefixed
+module can 'jump' out of @INC
+
+=item *
+
+L<Unicode::Collate> has been upgraded from version 0.78 to version 0.79.
=back