Changeset 264379 in webkit

Timestamp:

Jul 14, 2020, 3:51:19 PM (5 years ago)

Author:

mark.lam@apple.com

Message:

Handle out of memory error while creating an error message in the literal parser.
​https://bugs.webkit.org/show_bug.cgi?id=214313
<rdar://problem/65031745>

Reviewed by Saam Barati.

JSTests:

• stress/out-of-memory-making-error-string-in-literal-parser.js: Added.

Source/JavaScriptCore:

• runtime/LiteralParser.cpp:

(JSC::LiteralParser<CharType>::parse):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/out-of-memory-making-error-string-in-literal-parser.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/LiteralParser.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-07-14  Mark Lam  <mark.lam@apple.com>
+
+        Handle out of memory error while creating an error message in the literal parser.
+        https://bugs.webkit.org/show_bug.cgi?id=214313
+        <rdar://problem/65031745>
+
+        Reviewed by Saam Barati.
+
+        * stress/out-of-memory-making-error-string-in-literal-parser.js: Added.
+
 2020-07-14  Angelos Oikonomopoulos  <angelos@igalia.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-07-14  Mark Lam  <mark.lam@apple.com>
+
+        Handle out of memory error while creating an error message in the literal parser.
+        https://bugs.webkit.org/show_bug.cgi?id=214313
+        <rdar://problem/65031745>
+
+        Reviewed by Saam Barati.
+
+        * runtime/LiteralParser.cpp:
+        (JSC::LiteralParser<CharType>::parse):
+
 2020-07-14  Caitlin Potter  <caitp@igalia.com>
 

trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp

@@ -994 +994 @@
                     case TokIdentifier: {
                         typename Lexer::LiteralParserTokenPtr token = m_lexer.currentToken();
-                        if (token->stringIs8Bit)
-                            m_parseErrorMessage = makeString("Unexpected identifier \"", StringView { token->stringToken8, token->stringLength }, '"');
-                        else
-                            m_parseErrorMessage = makeString("Unexpected identifier \"", StringView { token->stringToken16, token->stringLength }, '"');
+
+                        auto tryMakeErrorString = [=] (typename Lexer::LiteralParserTokenPtr token, unsigned length, bool addEllipsis) -> String {
+                            if (token->stringIs8Bit)
+                                return tryMakeString("Unexpected identifier \"", StringView { token->stringToken8, length }, addEllipsis ? "..." : "", '"');
+                            return tryMakeString("Unexpected identifier \"", StringView { token->stringToken16, length }, addEllipsis ? "..." : "", '"');
+                        };
+
+                        String errorString = tryMakeErrorString(token, token->stringLength, false);
+                        if (!errorString) {
+                            constexpr unsigned shortLength = 10;
+                            if (token->stringLength > shortLength)
+                                errorString = tryMakeErrorString(token, shortLength, true);
+                            if (!errorString)
+                                errorString = "Unexpected identifier";
+                        }
+
+                        m_parseErrorMessage = errorString;
                         return JSValue();
                     }