Revert change #19126, a poor attempt at fixing bug #21742.

[p5sagit/p5-mst-13.2.git] / mg.c

diff --git a/mg.c b/mg.c
index 433cc23..ba576c3 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -1,6 +1,7 @@
 /*    mg.c
  *
- *    Copyright (c) 1991-2003, Larry Wall
+ *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ *    2000, 2001, 2002, 2003, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -33,6 +34,8 @@
 #  include <sys/pstat.h>
 #endif
 
+Signal_t Perl_csighandler(int sig);
+
 /* if you only have signal() and it resets on each signal, FAKE_PERSISTENT_SIGNAL_HANDLERS fixes */
 #if !defined(HAS_SIGACTION) && defined(VMS)
 #  define  FAKE_PERSISTENT_SIGNAL_HANDLERS
@@ -131,6 +134,12 @@ Perl_mg_get(pTHX_ SV *sv)
 
        if (!(mg->mg_flags & MGf_GSKIP) && vtbl && vtbl->svt_get) {
            CALL_FPTR(vtbl->svt_get)(aTHX_ sv, mg);
+
+           /* guard against sv having been freed */
+           if (SvTYPE(sv) == SVTYPEMASK) {
+               Perl_croak(aTHX_ "Tied variable freed while still in use");
+           }
+
            /* Don't restore the flags for this entry if it was deleted. */
            if (mg->mg_flags & MGf_GSKIP)
                (SSPTR(mgs_ix, MGS *))->mgs_flags = 0;
@@ -676,7 +685,16 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg)
                sv_setpvn(sv, WARN_NONEstring, WARNsize) ;
             }
             else if (PL_compiling.cop_warnings == pWARN_ALL) {
-               sv_setpvn(sv, WARN_ALLstring, WARNsize) ;
+               /* Get the bit mask for $warnings::Bits{all}, because
+                * it could have been extended by warnings::register */
+               SV **bits_all;
+               HV *bits=get_hv("warnings::Bits", FALSE);
+               if (bits && (bits_all=hv_fetch(bits, "all", 3, FALSE))) {
+                   sv_setsv(sv, *bits_all);
+               }
+               else {
+                   sv_setpvn(sv, WARN_ALLstring, WARNsize) ;
+               }
            }
             else {
                sv_setsv(sv, PL_compiling.cop_warnings);
@@ -874,8 +892,6 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg)
 #endif
        (void)SvIOK_on(sv);     /* what a wonderful hack! */
        break;
-    case '*':
-       break;
 #ifndef MACOS_TRADITIONAL
     case '0':
        break;
@@ -1058,7 +1074,7 @@ Perl_magic_getsig(pTHX_ SV *sv, MAGIC *mg)
     STRLEN n_a;
     /* Are we fetching a signal entry? */
     i = whichsig(MgPV(mg,n_a));
-    if (i) {
+    if (i > 0) {
        if(PL_psig_ptr[i])
            sv_setsv(sv,PL_psig_ptr[i]);
        else {
@@ -1109,7 +1125,7 @@ Perl_magic_clearsig(pTHX_ SV *sv, MAGIC *mg)
        I32 i;
        /* Are we clearing a signal entry? */
        i = whichsig(s);
-       if (i) {
+       if (i > 0) {
 #ifdef HAS_SIGPROCMASK
            sigset_t set, save;
            SV* save_sv;
@@ -1256,7 +1272,7 @@ Perl_magic_setsig(pTHX_ SV *sv, MAGIC *mg)
     }
     else {
        i = whichsig(s);        /* ...no, a brick */
-       if (!i) {
+       if (i < 0) {
            if (ckWARN(WARN_SIGNAL))
                Perl_warner(aTHX_ packWARN(WARN_SIGNAL), "No such signal: SIG%s", s);
            return 0;
@@ -2125,10 +2141,6 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
            }
        }
        break;
-    case '*':
-       i = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
-       PL_multiline = (i != 0);
-       break;
     case '/':
        SvREFCNT_dec(PL_rs);
        PL_rs = newSVsv(sv);
@@ -2422,7 +2434,7 @@ Perl_whichsig(pTHX_ char *sig)
 {
     register char **sigv;
 
-    for (sigv = PL_sig_name+1; *sigv; sigv++)
+    for (sigv = PL_sig_name; *sigv; sigv++)
        if (strEQ(sig,*sigv))
            return PL_sig_num[sigv - PL_sig_name];
 #ifdef SIGCLD
@@ -2433,7 +2445,7 @@ Perl_whichsig(pTHX_ char *sig)
     if (strEQ(sig,"CLD"))
        return SIGCHLD;
 #endif
-    return 0;
+    return -1;
 }
 
 #if !defined(PERL_IMPLICIT_CONTEXT)