Changeset 214767 in webkit

Timestamp:

Apr 3, 2017 4:07:46 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r214143 - import(arg) crashes when ToString(arg) throws
​https://bugs.webkit.org/show_bug.cgi?id=169778

Reviewed by Saam Barati.

JSTests:

• stress/import-reject-with-exception.js: Added.

(shouldBe):
(let.x.get toString):

Source/JavaScriptCore:

JSPromiseDeferred should not be rejected with Exception*.

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::globalFuncImportModule):

Location:

releases/WebKitGTK/webkit-2.16

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/import-reject-with-exception.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.16/JSTests/ChangeLog

@@ +1 @@
+2017-03-19  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        import(arg) crashes when ToString(arg) throws
+        https://bugs.webkit.org/show_bug.cgi?id=169778
+
+        Reviewed by Saam Barati.
+
+        * stress/import-reject-with-exception.js: Added.
+        (shouldBe):
+        (let.x.get toString):
+
 2017-03-15  Yusuke Suzuki  <utatane.tea@gmail.com>
 

releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-03-19  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        import(arg) crashes when ToString(arg) throws
+        https://bugs.webkit.org/show_bug.cgi?id=169778
+
+        Reviewed by Saam Barati.
+
+        JSPromiseDeferred should not be rejected with Exception*.
+
+        * runtime/JSGlobalObjectFunctions.cpp:
+        (JSC::globalFuncImportModule):
+
 2017-03-16  Mark Lam  <mark.lam@apple.com>
 

releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -949 +949 @@
     if (Exception* exception = catchScope.exception()) {
         catchScope.clearException();
-        promise->reject(exec, exception);
+        promise->reject(exec, exception->value());
         return JSValue::encode(promise->promise());
     }
@@ -956 +956 @@
     if (Exception* exception = catchScope.exception()) {
         catchScope.clearException();
-        promise->reject(exec, exception);
+        promise->reject(exec, exception->value());
         return JSValue::encode(promise->promise());
     }