with DEBUG_LEAKING_SCALARS, dump multiply-freed scalars

[perl5.git] / mg.c

diff --git a/mg.c b/mg.c
index 2f2d5ba..1aaf0ac 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -271,6 +271,8 @@ Perl_mg_set(pTHX_ SV *sv)
            mg->mg_flags &= ~MGf_GSKIP; /* setting requires another read */
            (SSPTR(mgs_ix, MGS*))->mgs_flags = 0;
        }
+       if (PL_localizing == 2 && !S_is_container_magic(mg))
+           continue;
        if (vtbl && vtbl->svt_set)
            CALL_FPTR(vtbl->svt_set)(aTHX_ sv, mg);
     }
@@ -519,7 +521,8 @@ Perl_magic_regdata_cnt(pTHX_ SV *sv, MAGIC *mg)
 
                /* return the last filled */
                while ( paren >= 0
-                       && (rx->startp[paren] == -1 || rx->endp[paren] == -1) )
+                       && (rx->offs[paren].start == -1
+                           || rx->offs[paren].end == -1) )
                    paren--;
                return (U32)paren;
            }
@@ -542,8 +545,8 @@ Perl_magic_regdatum_get(pTHX_ SV *sv, MAGIC *mg)
            if (paren < 0)
                return 0;
            if (paren <= (I32)rx->nparens &&
-               (s = rx->startp[paren]) != -1 &&
-               (t = rx->endp[paren]) != -1)
+               (s = rx->offs[paren].start) != -1 &&
+               (t = rx->offs[paren].end) != -1)
                {
                    register I32 i;
                    if (mg->mg_obj)             /* @+ */
@@ -590,8 +593,8 @@ Perl_magic_len(pTHX_ SV *sv, MAGIC *mg)
            paren = atoi(mg->mg_ptr); /* $& is in [0] */
          getparen:
            if (paren <= (I32)rx->nparens &&
-               (s1 = rx->startp[paren]) != -1 &&
-               (t1 = rx->endp[paren]) != -1)
+               (s1 = rx->offs[paren].start) != -1 &&
+               (t1 = rx->offs[paren].end) != -1)
            {
                i = t1 - s1;
              getlen:
@@ -634,8 +637,8 @@ Perl_magic_len(pTHX_ SV *sv, MAGIC *mg)
        return 0;
     case '`':
        if (PL_curpm && (rx = PM_GETRE(PL_curpm))) {
-           if (rx->startp[0] != -1) {
-               i = rx->startp[0];
+           if (rx->offs[0].start != -1) {
+               i = rx->offs[0].start;
                if (i > 0) {
                    s1 = 0;
                    t1 = i;
@@ -646,10 +649,10 @@ Perl_magic_len(pTHX_ SV *sv, MAGIC *mg)
        return 0;
     case '\'':
        if (PL_curpm && (rx = PM_GETRE(PL_curpm))) {
-           if (rx->endp[0] != -1) {
-               i = rx->sublen - rx->endp[0];
+           if (rx->offs[0].end != -1) {
+               i = rx->sublen - rx->offs[0].end;
                if (i > 0) {
-                   s1 = rx->endp[0];
+                   s1 = rx->offs[0].end;
                    t1 = rx->sublen;
                    goto getlen;
                }
@@ -2000,13 +2003,11 @@ Perl_magic_settaint(pTHX_ SV *sv, MAGIC *mg)
 {
     dVAR;
     PERL_UNUSED_ARG(sv);
-    /* update taint status unless we're restoring at scope exit */
-    if (PL_localizing != 2) {
-       if (PL_tainted)
-           mg->mg_len |= 1;
-       else
-           mg->mg_len &= ~1;
-    }
+    /* update taint status */
+    if (PL_tainted)
+       mg->mg_len |= 1;
+    else
+       mg->mg_len &= ~1;
     return 0;
 }