Changeset 249623 in webkit

Timestamp:

Sep 7, 2019 8:58:26 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Null check m_client in NetworkDataTask::didReceiveResponse
​https://bugs.webkit.org/show_bug.cgi?id=201587
<rdar://problem/54743444>

Reviewed by Chris Dumez.

clearClient can be called at any time. We null check it everyhere else we use it,
and we are seeing crashes at this call site. Let's not crash.

• NetworkProcess/NetworkDataTask.cpp:

(WebKit::NetworkDataTask::didReceiveResponse):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkDataTask.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-07  Alex Christensen  <achristensen@webkit.org>
+
+        Null check m_client in NetworkDataTask::didReceiveResponse
+        https://bugs.webkit.org/show_bug.cgi?id=201587
+        <rdar://problem/54743444>
+
+        Reviewed by Chris Dumez.
+
+        clearClient can be called at any time.  We null check it everyhere else we use it,
+        and we are seeing crashes at this call site.  Let's not crash.
+
+        * NetworkProcess/NetworkDataTask.cpp:
+        (WebKit::NetworkDataTask::didReceiveResponse):
+
 2019-09-07  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/NetworkDataTask.cpp

@@ -100 +100 @@
 void NetworkDataTask::didReceiveResponse(ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
 {
-    ASSERT(m_client);
     if (response.isHTTP09()) {
         auto url = response.url();
@@ -107 +106 @@
             completionHandler(PolicyAction::Ignore);
             cancel();
-            m_client->didCompleteWithError({ String(), 0, url, "Cancelled load from '" + url.stringCenterEllipsizedToLength() + "' because it is using HTTP/0.9." });
+            if (m_client)
+                m_client->didCompleteWithError({ String(), 0, url, "Cancelled load from '" + url.stringCenterEllipsizedToLength() + "' because it is using HTTP/0.9." });
             return;
         }
     }
-    m_client->didReceiveResponse(WTFMove(response), WTFMove(completionHandler));
+    if (m_client)
+        m_client->didReceiveResponse(WTFMove(response), WTFMove(completionHandler));
+    else
+        completionHandler(PolicyAction::Ignore);
 }