[perl #44999] ExtUtils::Constant::ProxySubs not thread-safe

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

diff --git a/mg.c b/mg.c
index c68543c..89f4c32 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -603,15 +603,15 @@ Perl_magic_len(pTHX_ SV *sv, MAGIC *mg)
     }
     case '`':
       do_prematch:
-      paren = RXf_PREMATCH;
+      paren = RX_BUFF_IDX_PREMATCH;
       goto maybegetparen;
     case '\'':
       do_postmatch:
-      paren = RXf_POSTMATCH;
+      paren = RX_BUFF_IDX_POSTMATCH;
       goto maybegetparen;
     case '&':
       do_match:
-      paren = RXf_MATCH;
+      paren = RX_BUFF_IDX_FULLMATCH;
       goto maybegetparen;
     case '1': case '2': case '3': case '4':
     case '5': case '6': case '7': case '8': case '9':
@@ -1317,6 +1317,9 @@ Perl_csighandler(int sig)
 #else
     dTHX;
 #endif
+#if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
+   va_list args;
+#endif
 #ifdef FAKE_PERSISTENT_SIGNAL_HANDLERS
     (void) rsignal(sig, PL_csighandlerp);
     if (PL_sig_ignoring[sig]) return;
@@ -1329,6 +1332,9 @@ Perl_csighandler(int sig)
             exit(1);
 #endif
 #endif
+#if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
+   va_start(args, sig);
+#endif
    if (
 #ifdef SIGILL
           sig == SIGILL ||
@@ -1345,6 +1351,9 @@ Perl_csighandler(int sig)
        (*PL_sighandlerp)(sig);
    else
        S_raise_signal(aTHX_ sig);
+#if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
+   va_end(args);
+#endif
 }
 
 #if defined(FAKE_PERSISTENT_SIGNAL_HANDLERS) || defined(FAKE_DEFAULT_SIGNAL_HANDLERS)
@@ -1541,26 +1550,6 @@ Perl_magic_setisa(pTHX_ SV *sv, MAGIC *mg)
     return 0;
 }
 
-int Perl_magic_freeisa(pTHX_ SV *sv, MAGIC *mg)
-{
-    dVAR;
-    GV** gvp;
-    GV* gv;
-    AV* isa;
-
-    PERL_UNUSED_ARG(sv);
-
-    if(PL_dirty) return 0;
-
-    gvp = (GV**)hv_fetchs(GvSTASH((GV*)mg->mg_obj), "ISA", FALSE);
-    gv = gvp ? *gvp : NULL;
-    isa = (gv && isGV_with_GP(gv)) ? GvAV(gv) : NULL;
-
-    if(isa) av_undef(isa);
-
-    return 0;
-}
-
 int
 Perl_magic_setamagic(pTHX_ SV *sv, MAGIC *mg)
 {
@@ -2255,15 +2244,15 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
           goto do_match;
     case '`': /* ${^PREMATCH} caught below */
       do_prematch:
-      paren = RXf_PREMATCH;
+      paren = RX_BUFF_IDX_PREMATCH;
       goto setparen;
     case '\'': /* ${^POSTMATCH} caught below */
       do_postmatch:
-      paren = RXf_POSTMATCH;
+      paren = RX_BUFF_IDX_POSTMATCH;
       goto setparen;
     case '&':
       do_match:
-      paren = RXf_MATCH;
+      paren = RX_BUFF_IDX_FULLMATCH;
       goto setparen;
     case '1': case '2': case '3': case '4':
     case '5': case '6': case '7': case '8': case '9':