Change 34296 by [EMAIL PROTECTED] on 2008/09/06 13:17:00
Integrate:
[ 33807]
Fix [perl #52740] crash when localizing a symtab entry
[ 34295]
Integrate:
[ 34213]
Change 33807 to fix bug #52740 wasn't quite right, as it ended up with
unitialised reads (and sometimes even SEGVs).
plus 1 line of 29544 in Perl_sv_setsv_flags().
Affected files ...
... //depot/maint-5.8/perl/sv.c#388 integrate
Differences ...
==== //depot/maint-5.8/perl/sv.c#388 (text) ====
Index: perl/sv.c
--- perl/sv.c#387~34293~ 2008-09-06 01:58:18.000000000 -0700
+++ perl/sv.c 2008-09-06 06:17:00.000000000 -0700
@@ -3492,7 +3492,8 @@
sflags = SvFLAGS(sstr);
if (sflags & SVf_ROK) {
- if (dtype == SVt_PVGV && SvTYPE(SvRV(sstr)) == SVt_PVGV) {
+ if (isGV_with_GP(dstr) && dtype == SVt_PVGV
+ && SvTYPE(SvRV(sstr)) == SVt_PVGV && isGV_with_GP(SvRV(sstr))) {
sstr = SvRV(sstr);
if (sstr == dstr) {
if (GvIMPORTED(dstr) != GVf_IMPORTED
End of Patch.
