PATCH: [perl #113750] re.pm clobbers $_

Thanks to Jesse Luehrs and Father Chrysostomos for testing advice.

(cherry-picked from commit 48895a0d16aef33c200bc9a07f22e18c23597c2a)

Conflicts:

	ext/re/re.pm
	pod/perldelta.pod

diff --git a/ext/re/re.pm b/ext/re/re.pm
index 9111129..5ce9801 100644 (file)
--- a/ext/re/re.pm
+++ b/ext/re/re.pm
@@ -4,7 +4,7 @@ package re;
 use strict;
 use warnings;
 
-our $VERSION     = "0.19";
+our $VERSION     = "0.19_01";
 our @ISA         = qw(Exporter);
 our @EXPORT_OK   = ('regmust',
                     qw(is_regexp regexp_pattern
@@ -142,7 +142,7 @@ sub bits {
            my $reflags = $^H{reflags} || 0;
            my $seen_charset;
            while ($s =~ m/( . )/gx) {
-                $_ = $1;
+                local $_ = $1;
                if (/[adul]/) {
                     # The 'a' may be repeated; hide this from the rest of the
                     # code by counting and getting rid of all of them, then

diff --git a/ext/re/t/re.t b/ext/re/t/re.t
index 5fbf3fd..13498bb 100644 (file)
--- a/ext/re/t/re.t
+++ b/ext/re/t/re.t
@@ -10,7 +10,7 @@ BEGIN {
 
 use strict;
 
-use Test::More tests => 14;
+use Test::More tests => 15;
 require_ok( 're' );
 
 # setcolor
@@ -63,6 +63,11 @@ my $ok='foo'=~/$reg/;
 eval"no re Debug=>'ALL'";
 ok( $ok, 'No segv!' );
 
+my $message = "Don't tread on me";
+$_ = $message;
+re->import("/aa");
+is($_, $message, "re doesn't clobber \$_");
+
 package Term::Cap;
 
 sub Tgetent {