Changeset 212530 in webkit

Timestamp:

Feb 16, 2017 9:28:18 PM (7 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r212330. rdar://problem/29899473

Location:

branches/safari-603-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentThreadableLoader.cpp (modified) (2 diffs)

branches/safari-603-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-16  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r212330. rdar://problem/29899473
+
+    2017-02-14  Brady Eidson  <beidson@apple.com>
+
+            Speculative fix for: Crash in DocumentThreadableLoader::redirectReceived.
+            <rdar://problem/29899473> and https://bugs.webkit.org/show_bug.cgi?id=168337
+
+            Reviewed by Geoffrey Garen.
+
+            No new tests (Unable to find a reproduction).
+
+            * loader/DocumentThreadableLoader.cpp:
+            (WebCore::DocumentThreadableLoader::loadRequest):
+
 2017-02-16  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-603-branch/Source/WebCore/loader/DocumentThreadableLoader.cpp

@@ -362 +362 @@
 void DocumentThreadableLoader::loadRequest(ResourceRequest&& request, SecurityCheckPolicy securityCheck)
 {
+    Ref<DocumentThreadableLoader> protectedThis(*this);
+
     // Any credential should have been removed from the cross-site requests.
     const URL& requestURL = request.url();
@@ -383 +385 @@
 
         ASSERT(!m_resource);
+        if (m_resource) {
+            CachedResourceHandle<CachedRawResource> resource = std::exchange(m_resource, nullptr);
+            resource->removeClient(*this);
+        }
+
         // We create an URL here as the request will be moved in requestRawResource
         URL requestUrl = newRequest.resourceRequest().url();