diff options
| author | Father Chrysostomos <sprout@cpan.org> | 2015-01-02 20:15:10 -0800 |
|---|---|---|
| committer | Father Chrysostomos <sprout@cpan.org> | 2015-01-03 16:05:56 -0800 |
| commit | 307cbb9fc37bc4e2ceb1d77690249dea0ccbc0ca (patch) | |
| tree | b985119437150cc1fc746d7cd643b4c87cd88813 /pad.c | |
| parent | fa87ec39c0ab9e6a9009caf5bc528efa6dc8aabc (diff) | |
| download | perl-307cbb9fc37bc4e2ceb1d77690249dea0ccbc0ca.tar.gz | |
Fix CvOUTSIDE for state subs in predeclared subs
use 5.018;
use experimental 'lexical_subs';
$::x = "global";
sub x;
sub x {
state $x = 42;
state sub x { print eval '$x', "\n" }
\&x;
}
x()->();
__END__
Output:
Segmentation fault: 11
Because this line in pad.c:S_findpadlex:
1141 const PADLIST * const padlist = CvPADLIST(cv);
is trying to read this SV:
SV = UNKNOWN(0x76) (0xaa170e4fd) at 0x10060c928
REFCNT = 1697135711
FLAGS = (PADSTALE,TEMP,GMG,SMG,IOK,pNOK,pPOK,UTF8)
(i.e., gibberish).
During compilation, ‘sub x{’ creates a new CV. When the sub is about
to be installed (when the final ‘}’ is reached), the existing stub
must be reused. So everything is copied from the new CV (PL_compcv)
to the stub. Also, any CvOUTSIDE pointers of nested subs get updated
to point to the erstwhile stub.
State subs were not getting their CvOUTSIDE pointers updated. This
patch implements that.
Diffstat (limited to 'pad.c')
| -rw-r--r-- | pad.c | 20 |
1 files changed, 16 insertions, 4 deletions
@@ -2327,18 +2327,30 @@ Perl_pad_fixup_inner_anons(pTHX_ PADLIST *padlist, CV *old_cv, CV *new_cv) PERL_UNUSED_ARG(old_cv); for (ix = PadnamelistMAX(comppad_name); ix > 0; ix--) { - const PADNAME * const name = namepad[ix]; - if (name && name != &PL_padname_undef && !PadnameIsSTATE(name) + const PADNAME *name = namepad[ix]; + if (name && name != &PL_padname_undef && !PadnameIsOUR(name) && *PadnamePV(name) == '&') { - if (SvTYPE(curpad[ix]) == SVt_PVCV) { + CV *innercv = MUTABLE_CV(curpad[ix]); + if (UNLIKELY(PadnameOUTER(name))) { + CV *cv = new_cv; + PADNAME **names = namepad; + PADOFFSET i = ix; + while (PadnameOUTER(name)) { + cv = CvOUTSIDE(cv); + names = PadlistNAMESARRAY(CvPADLIST(cv)); + i = PARENT_PAD_INDEX(name); + name = names[i]; + } + innercv = (CV *)PadARRAY(PadlistARRAY(CvPADLIST(cv))[1])[i]; + } + if (SvTYPE(innercv) == SVt_PVCV) { /* XXX 0afba48f added code here to check for a proto CV attached to the pad entry by magic. But shortly there- after 81df9f6f95 moved the magic to the pad name. The code here was never updated, so it wasn’t doing anything and got deleted when PADNAME became a distinct type. Is there any bug as a result? */ - CV * const innercv = MUTABLE_CV(curpad[ix]); if (CvOUTSIDE(innercv) == old_cv) { if (!CvWEAKOUTSIDE(innercv)) { SvREFCNT_dec(old_cv); |