Changeset 213206 in webkit

Timestamp:

Feb 28, 2017 11:34:15 PM (7 years ago)

Author:

Carlos Garcia Campos

Message:

NetworkProcess aborts in WebKit::NetworkLoad::didCompleteWithError at Source/WebKit2/NetworkProcess/NetworkLoad.cpp:423
​https://bugs.webkit.org/show_bug.cgi?id=168963

Reviewed by Antti Koivisto.

This is trying to call SpeculativeLoad::didFailLoading() after SpeculativeLoad has already been
completed. SpeculativeLoad::didComplete() call its completion handler that removes the load from
m_pendingPreloads. When the completion handler returns the SpeculativeLoad is deleted. So, we should always
ensure that SpeculativeLoad is not used after didComplete() call. In SpeculativeLoad::willSendRedirectedRequest(),
the call to NetworkLoad::continueWillSendRequest() causes SpeculativeLoad::didFailLoading() to be called. We
don't really need to call continueWillSendRequest() though, since the network load is going to be deleted anyway
by didComplete(), and the willSendRequest completion handler does nothing when the request is null.

• NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:

(WebKit::NetworkCache::SpeculativeLoad::willSendRedirectedRequest):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        NetworkProcess aborts in WebKit::NetworkLoad::didCompleteWithError at Source/WebKit2/NetworkProcess/NetworkLoad.cpp:423
+        https://bugs.webkit.org/show_bug.cgi?id=168963
+
+        Reviewed by Antti Koivisto.
+
+        This is trying to call SpeculativeLoad::didFailLoading() after SpeculativeLoad has already been
+        completed. SpeculativeLoad::didComplete() call its completion handler that removes the load from
+        m_pendingPreloads. When the completion handler returns the SpeculativeLoad is deleted. So, we should always
+        ensure that SpeculativeLoad is not used after didComplete() call. In SpeculativeLoad::willSendRedirectedRequest(),
+        the call to NetworkLoad::continueWillSendRequest() causes SpeculativeLoad::didFailLoading() to be called. We
+        don't really need to call continueWillSendRequest() though, since the network load is going to be deleted anyway
+        by didComplete(), and the willSendRequest completion handler does nothing when the request is null.
+
+        * NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
+        (WebKit::NetworkCache::SpeculativeLoad::willSendRedirectedRequest):
+
 2017-02-28  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp

@@ -77 +77 @@
         m_cacheEntry = NetworkCache::singleton().makeRedirectEntry(request, redirectResponse, redirectRequest);
 
-    auto load = WTFMove(m_networkLoad);
-
     // Don't follow the redirect. The redirect target will be registered for speculative load when it is loaded.
     didComplete();
-
-    // This causes call to didFailLoading().
-    if (load)
-        load->continueWillSendRequest({ });
 }