X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=sv.c;h=13b548bd5e16644fcba0fa18f5700d9396f6fb91;hb=158b3652342ca691c9e3b061a1d78456ae1a9b4a;hp=7e6bc2d7e4f514bda63e150dbed0f8d77b82e1cb;hpb=a6bdc2eb98f4e9bd74b51ad84203021dea610d6b;p=p5sagit%2Fp5-mst-13.2.git diff --git a/sv.c b/sv.c index 7e6bc2d..13b548b 100644 --- a/sv.c +++ b/sv.c @@ -3192,14 +3192,16 @@ would lose the UTF-8'ness of the PV. void Perl_sv_copypv(pTHX_ SV *dsv, register SV *ssv) { - SV *tmpsv = sv_newmortal(); + SV *tmpsv; - if ( SvTHINKFIRST(ssv) && SvROK(ssv) && SvAMAGIC(ssv) ) { - tmpsv = AMG_CALLun(ssv,string); + if ( SvTHINKFIRST(ssv) && SvROK(ssv) && SvAMAGIC(ssv) && + (tmpsv = AMG_CALLun(ssv,string))) { if (SvTYPE(tmpsv) != SVt_RV || (SvRV(tmpsv) != SvRV(ssv))) { SvSetSV(dsv,tmpsv); return; } + } else { + tmpsv = sv_newmortal(); } { STRLEN len;