Changeset 243335 in webkit

Timestamp:

Mar 21, 2019, 3:04:56 PM (7 years ago)

Author:

Tadeu Zagallo

Message:

JSC::createError should clear exception thrown by errorDescriptionForValue
​https://bugs.webkit.org/show_bug.cgi?id=196089

Reviewed by Mark Lam.

errorDescriptionForValue returns a nullString in case of failure, but it
might also throw an OOM exception when resolving a rope string. We need
to clear any potential exceptions thrown by errorDescriptionForValue
before returning the OOM from JSC::createError.

• runtime/ExceptionHelpers.cpp:

(JSC::createError):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/ExceptionHelpers.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-03-21  Tadeu Zagallo  <tzagallo@apple.com>
+
+        JSC::createError should clear exception thrown by errorDescriptionForValue
+        https://bugs.webkit.org/show_bug.cgi?id=196089
+
+        Reviewed by Mark Lam.
+
+        errorDescriptionForValue returns a nullString in case of failure, but it
+        might also throw an OOM exception when resolving a rope string. We need
+        to clear any potential exceptions thrown by errorDescriptionForValue
+        before returning the OOM from JSC::createError.
+
+        * runtime/ExceptionHelpers.cpp:
+        (JSC::createError):
+
 2019-03-21  Robin Morisset  <rmorisset@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp

@@ -276 +276 @@
 
     String valueDescription = errorDescriptionForValue(exec, value);
-    if (!valueDescription)
+    ASSERT(scope.exception() || !!valueDescription);
+    if (!valueDescription) {
+        scope.clearException();
         return createOutOfMemoryError(exec);
+    }
     String errorMessage = tryMakeString(valueDescription, ' ', message);
     if (!errorMessage)