take care of eof when parsing templates (fixes mozilla#1337)

rbri · Jun 8, 2023 · bde1f8a · bde1f8a
1 parent 5a0e5b3
commit bde1f8a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/org/mozilla/javascript/TokenStream.java b/src/org/mozilla/javascript/TokenStream.java
@@ -1611,7 +1611,12 @@ int readTemplateLiteral(boolean isTaggedLiteral) throws IOException {
                                             escapeVal = -1;
                                             break;
                                         }
+
                                         c = getTemplateLiteralChar();
+                                        if (c == EOF_CHAR) {
+                                            parser.reportError("msg.syntax");
+                                            return Token.ERROR;
+                                        }
 
                                         if (c == '}') {
                                             break;

diff --git a/testsrc/org/mozilla/javascript/tests/ParserTest.java b/testsrc/org/mozilla/javascript/tests/ParserTest.java
@@ -1389,6 +1389,15 @@ public void es6GeneratorNot() {
                 new String[] {"missing ( before function parameters."});
     }
 
+    @Test
+    public void oomOnInvalidInput() {
+        // parse();
+        expectParseErrors(
+                "`\\u{8",
+                new String[] {"syntax error"});
+
+    }
+
     private void expectParseErrors(String string, String[] errors) {
         parse(string, errors, null, false);
     }
@@ -1437,7 +1446,7 @@ public EvaluatorException runtimeError(
         AstRoot script = null;
         try {
             script = p.parse(string, null, 0);
-        } catch (EvaluatorException e) {
+        } catch (Exception e) {
             if (errors == null) {
                 // EvaluationExceptions should not occur when we aren't expecting
                 // errors.