Changeset 238453 in webkit

Timestamp:

Nov 22, 2018 5:33:40 PM (5 years ago)

Author:

mark.lam@apple.com

Message:

Make the jsc shell's dumpException() more robust against long exception strings.
​https://bugs.webkit.org/show_bug.cgi?id=191910
<rdar://problem/46212980>

Reviewed by Michael Saboff.

This only affects the dumping of the exception string in the jsc shell due to
unhandled exceptions or exceptions at shell boot time before any JS code is
running.

• jsc.cpp:

(dumpException):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jsc.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-11-22  Mark Lam  <mark.lam@apple.com>
+
+        Make the jsc shell's dumpException() more robust against long exception strings.
+        https://bugs.webkit.org/show_bug.cgi?id=191910
+        <rdar://problem/46212980>
+
+        Reviewed by Michael Saboff.
+
+        This only affects the dumping of the exception string in the jsc shell due to
+        unhandled exceptions or exceptions at shell boot time before any JS code is
+        running.
+
+        * jsc.cpp:
+        (dumpException):
+
 2018-11-21  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -2303 +2303 @@
     } while (false)
 
-    printf("Exception: %s\n", exception.toWTFString(globalObject->globalExec()).utf8().data());
+    auto exceptionString = exception.toWTFString(globalObject->globalExec());
+    Expected<CString, UTF8ConversionError> expectedCString = exceptionString.tryGetUtf8();
+    if (expectedCString)
+        printf("Exception: %s\n", expectedCString.value().data());
+    else
+        printf("Exception: <out of memory while extracting exception string>\n");
 
     Identifier nameID = Identifier::fromString(globalObject->globalExec(), "name");