Title: [218560] releases/WebKitGTK/webkit-2.16/Source/WebKit2
Revision
218560
Author
[email protected]
Date
2017-06-20 00:48:39 -0700 (Tue, 20 Jun 2017)

Log Message

Merge r217695 - REGRESSION (r206386): Xactimate Website Crashes @ com.apple.WebKit: WebKit::NPRuntimeObjectMap::convertJSValueToNPVariant + 255
https://bugs.webkit.org/show_bug.cgi?id=172846
<rdar://problem/31093005>

Reviewed by Andreas Kling.

In NPJSObject::invoke(), return early if there was an exception when calling JSC::call().
Using the value returned by JSC::call() when an exception occurred is unsafe.

* WebProcess/Plugins/Netscape/NPJSObject.cpp:
(WebKit::NPJSObject::invoke):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog (218559 => 218560)


--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog	2017-06-20 07:46:04 UTC (rev 218559)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog	2017-06-20 07:48:39 UTC (rev 218560)
@@ -1,3 +1,17 @@
+2017-06-01  Chris Dumez  <[email protected]>
+
+        REGRESSION (r206386): Xactimate Website Crashes @ com.apple.WebKit: WebKit::NPRuntimeObjectMap::convertJSValueToNPVariant + 255
+        https://bugs.webkit.org/show_bug.cgi?id=172846
+        <rdar://problem/31093005>
+
+        Reviewed by Andreas Kling.
+
+        In NPJSObject::invoke(), return early if there was an exception when calling JSC::call().
+        Using the value returned by JSC::call() when an exception occurred is unsafe.
+
+        * WebProcess/Plugins/Netscape/NPJSObject.cpp:
+        (WebKit::NPJSObject::invoke):
+
 2017-06-12  Carlos Garcia Campos  <[email protected]>
 
         [GTK] Stop dismissing menus attached to the web view for every injected event

Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp (218559 => 218560)


--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp	2017-06-20 07:46:04 UTC (rev 218559)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp	2017-06-20 07:48:39 UTC (rev 218560)
@@ -311,9 +311,13 @@
 
     JSValue value = JSC::call(exec, function, callType, callData, m_jsObject.get(), argumentList);
 
+    if (UNLIKELY(scope.exception())) {
+        scope.clearException();
+        return false;
+    }
+
     // Convert and return the result of the function call.
     m_objectMap->convertJSValueToNPVariant(exec, value, *result);
-    scope.clearException();
     
     return true;
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to