Zero length heredoc still crashed; ref Shopify/mruby-internal#81

b0886d56 · Yukihiro "Matz" Matsumoto · 5289b4ba · b0886d56
Commit b0886d56 authored Dec 17, 2016 by Yukihiro "Matz" Matsumoto
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

mrbgems/mruby-compiler/core/parse.y mrbgems/mruby-compiler/core/parse.y +6 -2

No files found.
--- a/mrbgems/mruby-compiler/core/parse.y
+++ b/mrbgems/mruby-compiler/core/parse.y
@@ -3948,10 +3948,14 @@ 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;
+          if (c < 0) {
+            p->parsing_heredoc = NULL;
+          }
+          else {
            return tHEREDOC_END;
          }
        }
+      }
      if (c < 0) {
        char buf[256];
        snprintf(buf, sizeof(buf), "can't find heredoc delimiter \"%s\" anywhere before EOF", hinf->term);