Title: [218561] releases/WebKitGTK/webkit-2.16/Source/WebKit2
- Revision
- 218561
- Author
- carlo...@webkit.org
- Date
- 2017-06-20 00:48:46 -0700 (Tue, 20 Jun 2017)
Log Message
Merge r217729 - 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 Mark Lam.
Follow-up to r217695 to deal with exceptions potentially thrown by
NPRuntimeObjectMap::convertJSValueToNPVariant() as well.
* WebProcess/Plugins/Netscape/NPJSObject.cpp:
(WebKit::NPJSObject::invoke):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog (218560 => 218561)
--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-06-20 07:48:39 UTC (rev 218560)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-06-20 07:48:46 UTC (rev 218561)
@@ -1,3 +1,17 @@
+2017-06-02 Chris Dumez <cdu...@apple.com>
+
+ 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 Mark Lam.
+
+ Follow-up to r217695 to deal with exceptions potentially thrown by
+ NPRuntimeObjectMap::convertJSValueToNPVariant() as well.
+
+ * WebProcess/Plugins/Netscape/NPJSObject.cpp:
+ (WebKit::NPJSObject::invoke):
+
2017-06-01 Chris Dumez <cdu...@apple.com>
REGRESSION (r206386): Xactimate Website Crashes @ com.apple.WebKit: WebKit::NPRuntimeObjectMap::convertJSValueToNPVariant + 255
Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp (218560 => 218561)
--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp 2017-06-20 07:48:39 UTC (rev 218560)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp 2017-06-20 07:48:46 UTC (rev 218561)
@@ -318,6 +318,11 @@
// Convert and return the result of the function call.
m_objectMap->convertJSValueToNPVariant(exec, value, *result);
+
+ if (UNLIKELY(scope.exception())) {
+ scope.clearException();
+ return false;
+ }
return true;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
