diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-12-17 15:08:05 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-12-18 02:02:30 +0900 |
| commit | b0886d5692dd58bed608fe8fb2be0c017c729060 (patch) | |
| tree | 9100920f69526ec9d43cf639ee8e8895e2d7cde3 | |
| parent | 5289b4ba117e66bdef1438ca754c894508a2447b (diff) | |
| download | mruby-b0886d5692dd58bed608fe8fb2be0c017c729060.tar.gz mruby-b0886d5692dd58bed608fe8fb2be0c017c729060.zip | |
Zero length heredoc still crashed; ref Shopify/mruby-internal#81
| -rw-r--r-- | mrbgems/mruby-compiler/core/parse.y | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y index fac779b07..ec9b652d7 100644 --- a/mrbgems/mruby-compiler/core/parse.y +++ b/mrbgems/mruby-compiler/core/parse.y @@ -3948,8 +3948,12 @@ parse_string(parser_state *p) } } if ((len-1 == hinf->term_len) && (strncmp(s, hinf->term, len-1) == 0)) { - if (c < 0) p->parsing_heredoc = NULL; - return tHEREDOC_END; + if (c < 0) { + p->parsing_heredoc = NULL; + } + else { + return tHEREDOC_END; + } } } if (c < 0) { |