Assert that SV type has magic member when reading/writing.

Will catch buggy code.

p4raw-id: //depot/perl@22934

1 files changed, 3 insertions, 2 deletions

diff --git a/sv.c b/sv.c
index fe1d406b5d..57ca682cbd 100644
--- a/sv.c
+++ b/sv.c
@@ -1869,6 +1869,9 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt)
 	Perl_croak(aTHX_ "Can't upgrade that kind of scalar");
     }
 
+    SvFLAGS(sv) &= ~SVTYPEMASK;
+    SvFLAGS(sv) |= mt;
+
     switch (mt) {
     case SVt_NULL:
 	Perl_croak(aTHX_ "Can't upgrade to undef");
@@ -2031,8 +2034,6 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt)
 	IoPAGE_LEN(sv)	= 60;
 	break;
     }
-    SvFLAGS(sv) &= ~SVTYPEMASK;
-    SvFLAGS(sv) |= mt;
     return TRUE;
 }