summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2015-05-24 01:40:51 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2015-05-24 01:40:51 +0900
commitf0424ff30856c9ffa3b53eab9e797bf6a475c1d2 (patch)
tree9073f953716ca1df146fddfbd0a7e2d480255f73 /src
parentb97c6d10a2c75822bd40e4019b1df64bcb22584e (diff)
parent4a791701bcc3572156795d8dbe5fab866a9be1f8 (diff)
downloadmruby-f0424ff30856c9ffa3b53eab9e797bf6a475c1d2.tar.gz
mruby-f0424ff30856c9ffa3b53eab9e797bf6a475c1d2.zip
Merge pull request #2803 from carsonmcdonald/specinheredoc
Add null check on lex_strterm in heredoc block
Diffstat (limited to 'src')
-rw-r--r--src/parse.y4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/parse.y b/src/parse.y
index 25522e8b0..0ed78d7e3 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -4150,7 +4150,9 @@ parser_yylex(parser_state *p)
p->lineno++;
p->column = 0;
if (p->parsing_heredoc != NULL) {
- return parse_string(p);
+ if (p->lex_strterm) {
+ return parse_string(p);
+ }
}
goto retry;
default: