Change 14307 by jhi@alpha on 2002/01/17 14:04:06
Retract #14144 as Hugo isn't happy with it.
Affected files ...
.... //depot/perl/scope.c#90 edit
.... //depot/perl/t/run/kill_perl.t#29 edit
Differences ...
==== //depot/perl/scope.c#90 (text) ====
Index: perl/scope.c
--- perl/scope.c.~1~ Thu Jan 17 07:15:05 2002
+++ perl/scope.c Thu Jan 17 07:15:05 2002
@@ -693,7 +693,9 @@
DEBUG_S(PerlIO_printf(Perl_debug_log,
"restore svref: %p %p:%s -> %p:%s\n",
ptr, sv, SvPEEK(sv), value, SvPEEK(value)));
- if (SvTYPE(sv) == SVt_PVMG && SvMAGIC(sv)) {
+ if (SvTYPE(sv) >= SVt_PVMG && SvMAGIC(sv) &&
+ SvTYPE(sv) != SVt_PVGV)
+ {
(void)SvUPGRADE(value, SvTYPE(sv));
SvMAGIC(value) = SvMAGIC(sv);
SvFLAGS(value) |= SvMAGICAL(sv);
@@ -705,7 +707,9 @@
* croaking that might ensue when the SvSETMAGIC() below is
* called, or to avoid two different SVs pointing at the same
* SvMAGIC()). This needs a total rethink. --GSAR */
- else if (SvTYPE(value) == SVt_PVMG && SvMAGIC(value)) {
+ else if (SvTYPE(value) >= SVt_PVMG && SvMAGIC(value) &&
+ SvTYPE(value) != SVt_PVGV)
+ {
SvFLAGS(value) |= (SvFLAGS(value) &
(SVp_NOK|SVp_POK)) >> PRIVSHIFT;
SvMAGICAL_off(value);
==== //depot/perl/t/run/kill_perl.t#29 (text) ====
Index: perl/t/run/kill_perl.t
--- perl/t/run/kill_perl.t.~1~ Thu Jan 17 07:15:05 2002
+++ perl/t/run/kill_perl.t Thu Jan 17 07:15:05 2002
@@ -756,18 +756,6 @@
print join '', @a, "\n";
EXPECT
123456789
-######## [ID 20010912.007] segfault or "Can't modify non-existent substring"
-$b="abcde";
-$s = \substr($b, 2, 1);
-print "before: $$s\n";
-{
- local $k;
- *k = $s;
-}
-print "after: $$s\n";
-EXPECT
-before: c
-after: c
######## [ID 20020104.007] "coredump on dbmclose"
package Foo;
eval { dbmclose %h }; # not all places have dbm* functions
End of Patch.
