Title: [248252] releases/WebKitGTK/webkit-2.24/Source/WebKit
- Revision
- 248252
- Author
- [email protected]
- Date
- 2019-08-03 20:24:02 -0700 (Sat, 03 Aug 2019)
Log Message
Merge r247507 - [GTK][WPE] Do not assert when receiving invalid data in injected bundle messages
https://bugs.webkit.org/show_bug.cgi?id=199830
Reviewed by Michael Catanzaro.
Just silently ignore them to avoid UI process crashes.
* UIProcess/API/glib/WebKitInjectedBundleClient.cpp:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (248251 => 248252)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-08-04 03:24:00 UTC (rev 248251)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-08-04 03:24:02 UTC (rev 248252)
@@ -1,3 +1,14 @@
+2019-07-17 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Do not assert when receiving invalid data in injected bundle messages
+ https://bugs.webkit.org/show_bug.cgi?id=199830
+
+ Reviewed by Michael Catanzaro.
+
+ Just silently ignore them to avoid UI process crashes.
+
+ * UIProcess/API/glib/WebKitInjectedBundleClient.cpp:
+
2019-05-06 Alex Christensen <[email protected]>
Null check m_mainFrame in WebPageProxy.cpp
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/glib/WebKitInjectedBundleClient.cpp (248251 => 248252)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/glib/WebKitInjectedBundleClient.cpp 2019-08-04 03:24:00 UTC (rev 248251)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/glib/WebKitInjectedBundleClient.cpp 2019-08-04 03:24:02 UTC (rev 248252)
@@ -110,13 +110,14 @@
WebImage* image = static_cast<WebImage*>(message.get("Snapshot"));
webKitWebViewDidReceiveSnapshot(webView, callbackID->value(), image);
#endif
- } else
- ASSERT_NOT_REACHED();
+ }
}
void didReceiveMessageFromInjectedBundle(WebProcessPool&, const String& messageName, API::Object* messageBody) override
{
- ASSERT(messageBody->type() == API::Object::Type::Dictionary);
+ if (messageBody->type() != API::Object::Type::Dictionary)
+ return;
+
API::Dictionary& message = *static_cast<API::Dictionary*>(messageBody);
CString messageNameUTF8 = messageName.utf8();
@@ -127,8 +128,7 @@
return;
didReceiveWebViewMessageFromInjectedBundle(webView, messageNameUTF8.data() + strlen("WebPage."), message);
- } else
- ASSERT_NOT_REACHED();
+ }
}
RefPtr<API::Object> getInjectedBundleInitializationUserData(WebProcessPool&)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
