Changeset 281175 in webkit

Timestamp:

Aug 17, 2021, 5:55:59 PM (5 years ago)

Author:

sihui_liu@apple.com

Message:

Fix crash in TestWebKitAPI.NetworkProcess.CrashWhenNotAssociatedWithDataStore
​https://bugs.webkit.org/show_bug.cgi?id=229209
rdar://82040197

Reviewed by Geoffrey Garen.

When getting network process connection fails, we don't need to retry or crash UI process if web process is
already gone.

• UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::getNetworkProcessConnection):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-17  Sihui Liu  <sihui_liu@apple.com>
+
+        Fix crash in TestWebKitAPI.NetworkProcess.CrashWhenNotAssociatedWithDataStore
+        https://bugs.webkit.org/show_bug.cgi?id=229209
+        rdar://82040197
+
+        Reviewed by Geoffrey Garen.
+
+        When getting network process connection fails, we don't need to retry or crash UI process if web process is
+        already gone.
+
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::getNetworkProcessConnection):
+
 2021-08-17  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -1737 +1737 @@
                     return;
 
+                if (!webProcessProxy)
+                    return;
+
                 int networkProcessIdentifier = 0;
                 String networkProcessState = "Unknown"_s;
@@ -1743 +1746 @@
                     networkProcessState = networkProcessProxy->stateString();
                 }
-                RELEASE_ASSERT_NOT_REACHED_WITH_MESSAGE("WebsiteDataStore::getNetworkProcessConnection: Failed to get connection - networkProcessProxy=%p, networkProcessIdentifier=%d, processState=%s, webProcessProxy=%p, webProcessIdentifier=%d", networkProcessProxy.get(), networkProcessIdentifier, networkProcessState.utf8().data(), webProcessProxy.get(), webProcessProxy ? webProcessProxy->processIdentifier() : 0);
+                RELEASE_ASSERT_NOT_REACHED_WITH_MESSAGE("WebsiteDataStore::getNetworkProcessConnection: Failed to get connection - networkProcessProxy=%p, networkProcessIdentifier=%d, processState=%s, webProcessProxy=%p, webProcessIdentifier=%d", networkProcessProxy.get(), networkProcessIdentifier, networkProcessState.utf8().data(), webProcessProxy.get(), webProcessProxy->processIdentifier());
 #endif
             };
 
-            if (shouldRetryOnFailure == ShouldRetryOnFailure::No) {
+            if (shouldRetryOnFailure == ShouldRetryOnFailure::No || !webProcessProxy) {
                 logError();
                 reply({ });