In perl.git, the branch smoke-me/sprout-maint-5.16 has been created
<http://perl5.git.perl.org/perl.git/commitdiff/c4d8885704f2b112d66e7854f620cc3bf4c8ae37?hp=0000000000000000000000000000000000000000>
at c4d8885704f2b112d66e7854f620cc3bf4c8ae37 (commit)
- Log -----------------------------------------------------------------
commit c4d8885704f2b112d66e7854f620cc3bf4c8ae37
Author: Father Chrysostomos <[email protected]>
Date: Thu Jun 28 20:28:09 2012 -0700
Formats in closures called outside closures â crash
If a format closing over lexical variables is defined inside a clo-
sure, it must only be called directly inside that closure, not from
any other eval, sub, or format.
Calling it from anywhere else started causing a crash in 5.10.0,
because the format would try to close over variables in the currently-
running sub, using padoffsets intended for a completely unrelated pad.
This commit stops it from crashing by checking whether the currently-
running sub is a clone of the formatâs outer sub (a closure proto-
type). If it is not, the outer closure prototype is used, resulting
in âVariable is not availableâ warnings.
This makes things work as well as they did in 5.8. Ideally, we should
search the call stack for the topmost clone of the formatâs outer sub;
but Iâm saving that for another commit.
(cherry picked from commit af41786fe5732d5ec7932b946eec99a695ac6e43)
M pad.c
M t/comp/form_scope.t
commit 3149499832234269562b98bc0d79ea07d4716d57
Author: Father Chrysostomos <[email protected]>
Date: Thu Jun 28 16:31:17 2012 -0700
Donât let formats outlive their outer subs
This began crashing in 5.11.3:
sub foo {
sub bar {
my ($a,$b,$c,$d,$e,$f,$g,$h,$i,$j,$k,$l,$m,$n,$o,$p,$q,$r,$s,$x);
format =
@||||||
$x
.
}
}
undef *bar;
write;
(On some systems, you need more alphabet soup to make it crash.)
This commit (just the perly.y part shown) caused it to crash:
commit 421f30ed1e95009450bdc7905bf3433ee806ea4f
Author: Zefram <[email protected]>
Date: Tue Dec 15 11:48:31 2009 +0100
[perl #22977] Bug in format/write
diff --git a/perly.y b/perly.y
index 18e5875..a61a6b3 100644
--- a/perly.y
+++ b/perly.y
@@ -511,7 +511,9 @@ peg : PEG
;
format : FORMAT startformsub formname block
- { SvREFCNT_inc_simple_void(PL_compcv);
+ {
+ CV *fmtcv = PL_compcv;
+ SvREFCNT_inc_simple_void(PL_compcv);
#ifdef MAD
$$ = newFORM($2, $3, $4);
prepend_madprops($1->tk_mad, $$, 'F');
@@ -521,6 +523,10 @@ format : FORMAT startformsub formname block
newFORM($2, $3, $4);
$$ = (OP*)NULL;
#endif
+ if (CvOUTSIDE(fmtcv) && !CvUNIQUE(CvOUTSIDE(fmtcv))) {
+ SvREFCNT_inc_simple_void(fmtcv);
+ pad_add_anon((SV*)fmtcv, OP_NULL);
+ }
}
;
Unfortunately, adding the format to the pad like that (to allow
pad_fixup_inner_anons to fix up formats as well as subs) is proble-
matic. It causes the formatâs CvOUTSIDE to be weak. Since the for-
mat does not hold a reference count on its outer sub, that sub can be
freed before the format. When that happens, regular subs are fixed
up by having CvOUTSIDE change to point to the grandparent. If you
do that for formats, you run into a problem: Formats can be cloned
even when the outer sub is not running. Formats are cloned whenever
invoked *by name* via write. If CvOUTSIDE points to a different sub,
then closing over the scalars in specific pad offsets in that sub can
result in reading past the end of the pad. If you donât read past the
end of the pad, you are still making variables close over unrelated
variables, so the inner $x could close over an outer @y, etc. Subrou-
tines donât have that problem, as they can only be cloned when they
have an outer sub. (Even though the outer subâs prototype, if it is a
closure, might have been freed, the outer sub itself is still running
and referenced by the context stack.)
This commit changes the direction of the weak reference between an
outer subâs pad and an inner format, fixing the crash.
To do so, it has to store, not the format itself, but a weak RV point-
ing to the format, in the outer subâs pad.
(cherry picked from commit e09ac076a1dab8e2c5712775f478fcfb61cb7eb3)
M pad.c
M t/comp/form_scope.t
-----------------------------------------------------------------------
--
Perl5 Master Repository
