Title: [231406] releases/WebKitGTK/webkit-2.20
- Revision
- 231406
- Author
- [email protected]
- Date
- 2018-05-07 00:46:30 -0700 (Mon, 07 May 2018)
Log Message
Merge r231298 - REGRESSION(r222772): [GTK][WPE] WebProcess from WebKitGtk+ 2.19.9x SIGSEVs in WebKit::WebProcess::ensureNetworkProcessConnection() at Source/WebKit/WebProcess/WebProcess.cpp:1127
https://bugs.webkit.org/show_bug.cgi?id=183348
Reviewed by Michael Catanzaro.
Source/WebKit:
When connection doesn't exit in case of sync message failure, always exit in case of failing to send
GetNetworkProcessConnection or GetStorageProcessConnection messages. This can happen when the WebView is created
and destroyed quickly.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::ensureNetworkProcessConnection):
(WebKit::WebProcess::ensureWebToStorageProcessConnection):
Tools:
Add a test case to reproduce the crash.
* TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp:
(testWebViewCloseQuickly):
(beforeAll):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog (231405 => 231406)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-05-07 07:46:08 UTC (rev 231405)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-05-07 07:46:30 UTC (rev 231406)
@@ -1,3 +1,18 @@
+2018-05-03 Carlos Garcia Campos <[email protected]>
+
+ REGRESSION(r222772): [GTK][WPE] WebProcess from WebKitGtk+ 2.19.9x SIGSEVs in WebKit::WebProcess::ensureNetworkProcessConnection() at Source/WebKit/WebProcess/WebProcess.cpp:1127
+ https://bugs.webkit.org/show_bug.cgi?id=183348
+
+ Reviewed by Michael Catanzaro.
+
+ When connection doesn't exit in case of sync message failure, always exit in case of failing to send
+ GetNetworkProcessConnection or GetStorageProcessConnection messages. This can happen when the WebView is created
+ and destroyed quickly.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::ensureNetworkProcessConnection):
+ (WebKit::WebProcess::ensureWebToStorageProcessConnection):
+
2018-04-10 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.20.1 release.
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/WebProcess.cpp (231405 => 231406)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/WebProcess.cpp 2018-05-07 07:46:08 UTC (rev 231405)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/WebProcess.cpp 2018-05-07 07:46:30 UTC (rev 231406)
@@ -1121,8 +1121,18 @@
if (!m_networkProcessConnection) {
IPC::Attachment encodedConnectionIdentifier;
- if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetNetworkProcessConnection(), Messages::WebProcessProxy::GetNetworkProcessConnection::Reply(encodedConnectionIdentifier), 0, Seconds::infinity(), IPC::SendSyncOption::DoNotProcessIncomingMessagesWhenWaitingForSyncReply))
+ if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetNetworkProcessConnection(), Messages::WebProcessProxy::GetNetworkProcessConnection::Reply(encodedConnectionIdentifier), 0, Seconds::infinity(), IPC::SendSyncOption::DoNotProcessIncomingMessagesWhenWaitingForSyncReply)) {
+#if PLATFORM(GTK) || PLATFORM(WPE)
+ // GTK+ and WPE ports don't exit on send sync message failure.
+ // In this particular case, the network process can be terminated by the UI process while the
+ // Web process is still initializing, so we always want to exit instead of crashing. This can
+ // happen when the WebView is created and then destroyed quickly.
+ // See https://bugs.webkit.org/show_bug.cgi?id=183348.
+ exit(0);
+#else
CRASH();
+#endif
+ }
#if USE(UNIX_DOMAIN_SOCKETS)
IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
@@ -1193,8 +1203,16 @@
if (!m_webToStorageProcessConnection) {
IPC::Attachment encodedConnectionIdentifier;
- if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetStorageProcessConnection(initialSessionID), Messages::WebProcessProxy::GetStorageProcessConnection::Reply(encodedConnectionIdentifier), 0))
+ if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetStorageProcessConnection(initialSessionID), Messages::WebProcessProxy::GetStorageProcessConnection::Reply(encodedConnectionIdentifier), 0)) {
+#if PLATFORM(GTK) || PLATFORM(WPE)
+ // GTK+ and WPE ports don't exit on send sync message failure.
+ // In this particular case, the storage process can be terminated by the UI process while the
+ // connection is being done, so we always want to exit instead of crashing.
+ // See https://bugs.webkit.org/show_bug.cgi?id=183348.
+#else
CRASH();
+#endif
+ }
#if USE(UNIX_DOMAIN_SOCKETS)
IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
Modified: releases/WebKitGTK/webkit-2.20/Tools/ChangeLog (231405 => 231406)
--- releases/WebKitGTK/webkit-2.20/Tools/ChangeLog 2018-05-07 07:46:08 UTC (rev 231405)
+++ releases/WebKitGTK/webkit-2.20/Tools/ChangeLog 2018-05-07 07:46:30 UTC (rev 231406)
@@ -1,3 +1,16 @@
+2018-05-03 Carlos Garcia Campos <[email protected]>
+
+ REGRESSION(r222772): [GTK][WPE] WebProcess from WebKitGtk+ 2.19.9x SIGSEVs in WebKit::WebProcess::ensureNetworkProcessConnection() at Source/WebKit/WebProcess/WebProcess.cpp:1127
+ https://bugs.webkit.org/show_bug.cgi?id=183348
+
+ Reviewed by Michael Catanzaro.
+
+ Add a test case to reproduce the crash.
+
+ * TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp:
+ (testWebViewCloseQuickly):
+ (beforeAll):
+
2018-04-03 Carlos Garcia Campos <[email protected]>
ASSERTION FAILED: !m_mainFrame->coreFrame()->loader().frameHasLoaded() || !m_pendingNavigationID when reloading page while a page is loading
Modified: releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp (231405 => 231406)
--- releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp 2018-05-07 07:46:08 UTC (rev 231405)
+++ releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp 2018-05-07 07:46:30 UTC (rev 231406)
@@ -107,6 +107,18 @@
g_object_unref(webContext2);
}
+static void testWebViewCloseQuickly(WebViewTest* test, gconstpointer)
+{
+ auto webView = Test::adoptView(Test::createWebView());
+ test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(webView.get()));
+ g_idle_add([](gpointer userData) -> gboolean {
+ static_cast<WebViewTest*>(userData)->quitMainLoop();
+ return G_SOURCE_REMOVE;
+ }, test);
+ g_main_loop_run(test->m_mainLoop);
+ webView = nullptr;
+}
+
#if PLATFORM(WPE)
static void testWebViewWebBackend(Test* test, gconstpointer)
{
@@ -1188,6 +1200,7 @@
WebViewTest::add("WebKitWebView", "web-context", testWebViewWebContext);
WebViewTest::add("WebKitWebView", "web-context-lifetime", testWebViewWebContextLifetime);
+ WebViewTest::add("WebKitWebView", "close-quickly", testWebViewCloseQuickly);
#if PLATFORM(WPE)
Test::add("WebKitWebView", "backend", testWebViewWebBackend);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
