Title: [161179] trunk/Source/WebCore
Revision
161179
Author
[email protected]
Date
2013-12-31 00:34:32 -0800 (Tue, 31 Dec 2013)

Log Message

[SOUP] Return early in ResourceHandle::receivedCancellation if the load has already cancelled
https://bugs.webkit.org/show_bug.cgi?id=126287

Reviewed by Martin Robinson.

This situation can happen when using the network process, because
the ReceivedCancellation message can be received when the resource
loader has already been removed, but the authentication challenge
still has a reference to the ResourceHandleClient.

* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::ResourceHandle::receivedCancellation):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (161178 => 161179)


--- trunk/Source/WebCore/ChangeLog	2013-12-31 08:32:10 UTC (rev 161178)
+++ trunk/Source/WebCore/ChangeLog	2013-12-31 08:34:32 UTC (rev 161179)
@@ -1,5 +1,20 @@
 2013-12-31  Carlos Garcia Campos  <[email protected]>
 
+        [SOUP] Return early in ResourceHandle::receivedCancellation if the load has already cancelled
+        https://bugs.webkit.org/show_bug.cgi?id=126287
+
+        Reviewed by Martin Robinson.
+
+        This situation can happen when using the network process, because
+        the ReceivedCancellation message can be received when the resource
+        loader has already been removed, but the authentication challenge
+        still has a reference to the ResourceHandleClient.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::ResourceHandle::receivedCancellation):
+
+2013-12-31  Carlos Garcia Campos  <[email protected]>
+
         [SOUP] The initiating page is lost after a redirection
         https://bugs.webkit.org/show_bug.cgi?id=126293
 

Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (161178 => 161179)


--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp	2013-12-31 08:32:10 UTC (rev 161178)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp	2013-12-31 08:34:32 UTC (rev 161179)
@@ -1263,6 +1263,13 @@
     if (challenge != d->m_currentWebChallenge)
         return;
 
+    if (cancelledOrClientless()) {
+        clearAuthentication();
+        return;
+    }
+
+    ASSERT(challenge.soupSession());
+    ASSERT(challenge.soupMessage());
     soup_session_unpause_message(challenge.soupSession(), challenge.soupMessage());
 
     if (client())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to