Change 20597 by [EMAIL PROTECTED] on 2003/08/10 17:55:03
Subject: Re: [perl #23265] Nested anonymous subs
From: Dave Mitchell <[EMAIL PROTECTED]>
Date: Sun, 10 Aug 2003 01:35:30 +0100
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/pad.c#25 edit
... //depot/perl/t/op/closure.t#19 edit
Differences ...
==== //depot/perl/pad.c#25 (text) ====
Index: perl/pad.c
--- perl/pad.c#24~20584~ Sat Aug 9 11:05:22 2003
+++ perl/pad.c Sun Aug 10 10:55:03 2003
@@ -258,9 +258,15 @@
{
assert(CvWEAKOUTSIDE(innercv));
CvWEAKOUTSIDE_off(innercv);
- CvOUTSIDE(innercv) = outercv;
CvOUTSIDE_SEQ(innercv) = seq;
- SvREFCNT_inc(outercv);
+ /* don't relink to grandfather if he's being freed */
+ if (SvREFCNT(outercv)) {
+ CvOUTSIDE(innercv) = outercv;
+ SvREFCNT_inc(outercv);
+ }
+ else {
+ CvOUTSIDE(innercv) = Nullcv;
+ }
}
}
}
==== //depot/perl/t/op/closure.t#19 (xtext) ====
Index: perl/t/op/closure.t
--- perl/t/op/closure.t#18~19637~ Thu May 29 11:47:40 2003
+++ perl/t/op/closure.t Sun Aug 10 10:55:03 2003
@@ -13,7 +13,7 @@
use Config;
-print "1..184\n";
+print "1..185\n";
my $test = 1;
sub test (&) {
@@ -641,4 +641,27 @@
test { $a{7}->()->() + $a{11}->()->() == 18 };
}
+# bugid #23265 - this used to coredump during destruction of PL_maincv
+# and its children
+
+require './test.pl';
+
+my $got = runperl(
+ prog => q[
+ print
+ sub {$_[0]->(@_)} -> (
+ sub {
+ $_[1]
+ ? $_[0]->($_[0], $_[1] - 1) . sub {"x"}->()
+ : "y"
+ },
+ 2
+ )
+ , "\n"
+ ;
+
+ ],
+ stderr => 1
+);
+test { $got eq "yxx\n" };
End of Patch.
