Change 34295 by [EMAIL PROTECTED] on 2008/09/06 09:32:00
Integrate:
[ 34213]
Change 33807 to fix bug #52740 wasn't quite right, as it ended up with
unitialised reads (and sometimes even SEGVs).
Affected files ...
... //depot/maint-5.10/perl/sv.c#25 integrate
Differences ...
==== //depot/maint-5.10/perl/sv.c#25 (text) ====
Index: perl/sv.c
--- perl/sv.c#24~34275~ 2008-09-05 08:12:25.000000000 -0700
+++ perl/sv.c 2008-09-06 02:32:00.000000000 -0700
@@ -3612,7 +3612,7 @@
Perl_croak(aTHX_ "Cannot copy to %s", type);
} else if (sflags & SVf_ROK) {
if (isGV_with_GP(dstr) && dtype == SVt_PVGV
- && SvTYPE(SvRV(sstr)) == SVt_PVGV) {
+ && SvTYPE(SvRV(sstr)) == SVt_PVGV && isGV_with_GP(SvRV(sstr))) {
sstr = SvRV(sstr);
if (sstr == dstr) {
if (GvIMPORTED(dstr) != GVf_IMPORTED
@@ -3623,10 +3623,8 @@
GvMULTI_on(dstr);
return;
}
- if (isGV_with_GP(sstr)) {
- glob_assign_glob(dstr, sstr, dtype);
- return;
- }
+ glob_assign_glob(dstr, sstr, dtype);
+ return;
}
if (dtype >= SVt_PV) {
End of Patch.
