Changeset 183861 in webkit

Timestamp:

May 5, 2015, 11:55:16 PM (10 years ago)

Author:

ap@apple.com

Message:

NetworkResourceLoader::cleanup() should clear ResourceHandle client pointer.
​https://bugs.webkit.org/show_bug.cgi?id=144641
rdar://problem/20250960

Reviewed by David Kilzer.

• NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::cleanup):

Clear the client pointer.

• Shared/Authentication/AuthenticationManager.cpp:

(WebKit::AuthenticationManager::useCredentialForChallenge):
(WebKit::AuthenticationManager::continueWithoutCredentialForChallenge):
(WebKit::AuthenticationManager::cancelChallenge):
(WebKit::AuthenticationManager::performDefaultHandling):
(WebKit::AuthenticationManager::rejectProtectionSpaceAndContinue):
Updated comments, which were not accurate, at least on Mac.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (1 diff)
• Shared/Authentication/AuthenticationManager.cpp (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-05-05  Alexey Proskuryakov  <ap@apple.com>
+
+        NetworkResourceLoader::cleanup() should clear ResourceHandle client pointer.
+        https://bugs.webkit.org/show_bug.cgi?id=144641
+        rdar://problem/20250960
+
+        Reviewed by David Kilzer.
+
+        * NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::cleanup):
+        Clear the client pointer.
+
+        * Shared/Authentication/AuthenticationManager.cpp:
+        (WebKit::AuthenticationManager::useCredentialForChallenge):
+        (WebKit::AuthenticationManager::continueWithoutCredentialForChallenge):
+        (WebKit::AuthenticationManager::cancelChallenge):
+        (WebKit::AuthenticationManager::performDefaultHandling):
+        (WebKit::AuthenticationManager::rejectProtectionSpaceAndContinue):
+        Updated comments, which were not accurate, at least on Mac.
+
 2015-05-05  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -205 +205 @@
     invalidateSandboxExtensions();
 
-    m_handle = nullptr;
+    if (m_handle) {
+        m_handle->setClient(nullptr);
+        m_handle = nullptr;
+    }
 
     // This will cause NetworkResourceLoader to be destroyed and therefore we do it last.

trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp

@@ -117 +117 @@
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedCredential(challenge, credential);
         return;
@@ -133 +134 @@
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedRequestToContinueWithoutCredential(challenge);
         return;
@@ -149 +151 @@
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedCancellation(challenge);
         return;
@@ -165 +168 @@
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedRequestToPerformDefaultHandling(challenge);
         return;
@@ -181 +185 @@
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedChallengeRejection(challenge);
         return;