Call SvMAGICAL_off in mg_free

Message-ID: <20080505161856.pgz4pjga1w44ksk4@horde.wizbit.be>

p4raw-id: //depot/perl@33815

diff --git a/mg.c b/mg.c
index 25abdce..f3e6ae9 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -532,6 +532,7 @@ Perl_mg_free(pTHX_ SV *sv)
        SvMAGIC_set(sv, moremagic);
     }
     SvMAGIC_set(sv, NULL);
+    SvMAGICAL_off(sv);
     return 0;
 }
 

diff --git a/sv.c b/sv.c
index 44307d4..716c2ee 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -3553,7 +3553,6 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV* sstr, const I32 flags)
     {
        /* need to nuke the magic */
        mg_free(dstr);
-       SvRMAGICAL_off(dstr);
     }
 
     /* There's a lot of redundancy below but we're going for speed here */