From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Mon, 7 May 2007 13:38:24 +0000 (+0000)
Subject: Fix [perl #42163] "use base" masks $SIG{__DIE__}
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=150ffd395f221403ba49c4cd1c17da7e3f7adc59;p=p5sagit%2Fp5-mst-13.2.git

Fix [perl #42163] "use base" masks $SIG{__DIE__}
adapted from a patch by Michael G Schwern

p4raw-id: //depot/perl@31163
---

diff --git a/lib/base.pm b/lib/base.pm
index d8baa95..8bcbb5f 100644
--- a/lib/base.pm
+++ b/lib/base.pm
@@ -2,7 +2,7 @@ package base;
 
 use strict 'vars';
 use vars qw($VERSION);
-$VERSION = '2.08';
+$VERSION = '2.09';
 
 # constant.pm is slow
 sub SUCCESS () { 1 }
@@ -82,19 +82,24 @@ sub import {
 	      unless defined ${$base.'::VERSION'};
         }
         else {
-            local $SIG{__DIE__};
-            eval "require $base";
-            # Only ignore "Can't locate" errors from our eval require.
-            # Other fatal errors (syntax etc) must be reported.
-            die if $@ && $@ !~ /^Can't locate .*? at \(eval /;
-            unless (%{"$base\::"}) {
-                require Carp;
-                Carp::croak(<<ERROR);
+	    my $sigdie;
+	    {
+		local $SIG{__DIE__};
+		eval "require $base";
+		# Only ignore "Can't locate" errors from our eval require.
+		# Other fatal errors (syntax etc) must be reported.
+		die if $@ && $@ !~ /^Can't locate .*? at \(eval /;
+		unless (%{"$base\::"}) {
+		    require Carp;
+		    Carp::croak(<<ERROR);
 Base class package "$base" is empty.
     (Perhaps you need to 'use' the module which defines that package first.)
 ERROR
-
-            }
+		}
+		$sigdie = $SIG{__DIE__};
+	    }
+	    # Make sure a global $SIG{__DIE__} makes it out of the localization.
+	    $SIG{__DIE__} = $sigdie if defined $sigdie;
             ${$base.'::VERSION'} = "-1, set by base.pm"
               unless defined ${$base.'::VERSION'};
         }