From 45f3f24684363c03c905ddeea6353a16213e34e8 Mon Sep 17 00:00:00 2001 From: Father Chrysostomos Date: Fri, 28 Aug 2015 20:53:11 +0100 Subject: [perl #123893] Fix hang with "@{" Commit v5.21.8-320-ge47d32d stopped code interpolated into quote-like operators from reading more lines of input, by making lex_next_chunk ignore the open filehandle and return false. That causes this block under case 0 in yylex to loop: if (!lex_next_chunk(fake_eof)) { CopLINE_dec(PL_curcop); s = PL_bufptr; TOKEN(';'); /* not infinite loop because rsfp is NULL now */ } (rsfp is not null there.) This commit makes it check for quote-like operators above, in the same place where it checks whether the file is open, to avoid falling through to this code that can loop. This changes the syntax errors for a couple of cases recently added to t/op/lex.t, though I think the error output is now more consis- tent overall. (cherry picked from commit 0f9d53bbcafba2b30e50a1ad22c7759be170e14a) --- toke.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'toke.c') diff --git a/toke.c b/toke.c index f59f913486..50e2d59197 100644 --- a/toke.c +++ b/toke.c @@ -5198,7 +5198,8 @@ Perl_yylex(pTHX) if (PL_madskills) PL_faketokens = 0; #endif - if (!PL_rsfp && (!PL_parser->filtered || s+1 < PL_bufend)) { + if ((!PL_rsfp || PL_lex_inwhat) + && (!PL_parser->filtered || s+1 < PL_bufend)) { PL_last_uni = 0; PL_last_lop = 0; if (PL_lex_brackets && -- cgit v1.2.1