Changeset 24624 in webkit

Timestamp:

Jul 25, 2007, 9:54:22 AM (18 years ago)

Author:

darin

Message:

Reviewed by Maciej, Darin.

• ​http://bugs.webkit.org/show_bug.cgi?id=14030

Add ResourceHandle::setClient to resolve some messiness with handle
releasing. Clear the client when ResourceLoader is going to release
the handle to prevent crashes in the case where somebody still holds a
reference (this doesn't seem to currently happen in practice). Add
NULL-checking for ResourceHandle implementations using the client.

• loader/ResourceLoader.cpp: (WebCore::ResourceLoader::releaseResources):
• platform/network/ResourceHandle.cpp: (WebCore::ResourceHandle::fireBlockedFailure): (WebCore::ResourceHandle::setClient):
• platform/network/ResourceHandle.h:
• platform/network/cf/ResourceHandleCFNet.cpp: (WebCore::willSendRequest): (WebCore::didReceiveResponse): (WebCore::didReceiveData): (WebCore::didFinishLoading): (WebCore::didFail): (WebCore::willCacheResponse): (WebCore::ResourceHandle::didReceiveAuthenticationChallenge): (WebCore::ResourceHandle::receivedCancellation):
• platform/network/mac/ResourceHandleMac.mm: (WebCore::ResourceHandle::didReceiveAuthenticationChallenge): (WebCore::ResourceHandle::didCancelAuthenticationChallenge): (WebCore::ResourceHandle::receivedCancellation): (-[WebCoreResourceHandleAsDelegate connection:willSendRequest:redirectResponse:]): (-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]): (-[WebCoreResourceHandleAsDelegate connection:didReceiveData:lengthReceived:]): (-[WebCoreResourceHandleAsDelegate connection:willStopBufferingData:]): (-[WebCoreResourceHandleAsDelegate connectionDidFinishLoading:]): (-[WebCoreResourceHandleAsDelegate connection:didFailWithError:]): (-[WebCoreResourceHandleAsDelegate connection:willCacheResponse:]):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/ResourceLoader.cpp (modified) (1 diff)
• platform/network/ResourceHandle.cpp (modified) (2 diffs)
• platform/network/ResourceHandle.h (modified) (1 diff)
• platform/network/cf/ResourceHandleCFNet.cpp (modified) (8 diffs)
• platform/network/mac/ResourceHandleMac.mm (modified) (10 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-25  Marvin Decker  <marv.decker@gmail.com>
+
+        Reviewed by Maciej, Darin.
+
+        - http://bugs.webkit.org/show_bug.cgi?id=14030
+
+        Add ResourceHandle::setClient to resolve some messiness with handle
+        releasing. Clear the client when ResourceLoader is going to release
+        the handle to prevent crashes in the case where somebody still holds a
+        reference (this doesn't seem to currently happen in practice). Add
+        NULL-checking for ResourceHandle implementations using the client.
+
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::releaseResources):
+        * platform/network/ResourceHandle.cpp:
+        (WebCore::ResourceHandle::fireBlockedFailure):
+        (WebCore::ResourceHandle::setClient):
+        * platform/network/ResourceHandle.h:
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::willSendRequest):
+        (WebCore::didReceiveResponse):
+        (WebCore::didReceiveData):
+        (WebCore::didFinishLoading):
+        (WebCore::didFail):
+        (WebCore::willCacheResponse):
+        (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
+        (WebCore::ResourceHandle::receivedCancellation):
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
+        (WebCore::ResourceHandle::didCancelAuthenticationChallenge):
+        (WebCore::ResourceHandle::receivedCancellation):
+        (-[WebCoreResourceHandleAsDelegate connection:willSendRequest:redirectResponse:]):
+        (-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]):
+        (-[WebCoreResourceHandleAsDelegate connection:didReceiveData:lengthReceived:]):
+        (-[WebCoreResourceHandleAsDelegate connection:willStopBufferingData:]):
+        (-[WebCoreResourceHandleAsDelegate connectionDidFinishLoading:]):
+        (-[WebCoreResourceHandleAsDelegate connection:didFailWithError:]):
+        (-[WebCoreResourceHandleAsDelegate connection:willCacheResponse:]):
+
 2007-07-25  Maxime Britto  <mbritto@pleyo.com>
 

trunk/WebCore/loader/ResourceLoader.cpp

@@ -90 +90 @@
     m_identifier = 0;
 
-    m_handle = 0;
+    if (m_handle) {
+        // Clear out the ResourceHandle's client so that it doesn't try to call
+        // us back after we release it.
+        m_handle->setClient(0);
+        m_handle = 0;
+    }
+
     m_resourceData = 0;
     m_deferredRequest = ResourceRequest();

trunk/WebCore/platform/network/ResourceHandle.cpp

@@ -65 +65 @@
 void ResourceHandle::fireBlockedFailure(Timer<ResourceHandle>* timer)
 {
-    client()->wasBlocked(this);
+    if (client())
+        client()->wasBlocked(this);
     delete timer;
 }
@@ -72 +73 @@
 {
     return d->m_client;
+}
+
+void ResourceHandle::setClient(ResourceHandleClient* client)
+{
+    d->m_client = client;
 }
 

trunk/WebCore/platform/network/ResourceHandle.h

@@ -149 +149 @@
     void clearAuthentication();
     void cancel();
-    
+
+    // The client may be 0, in which case no callbacks will be made.
     ResourceHandleClient* client() const;
+    void setClient(ResourceHandleClient*);
+
     void setDefersLoading(bool);
       

trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

@@ -67 +67 @@
 
     ResourceRequest request(cfRequest);
-    handle->client()->willSendRequest(handle, request, cfRedirectResponse);
+    if (handle->client())
+        handle->client()->willSendRequest(handle, request, cfRedirectResponse);
 
     cfRequest = request.cfURLRequest();
@@ -81 +82 @@
     LOG(Network, "CFNet - didReceiveResponse(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().url().ascii());
 
-    handle->client()->didReceiveResponse(handle, cfResponse);
+    if (handle->client())
+        handle->client()->didReceiveResponse(handle, cfResponse);
 }
 
@@ -92 +94 @@
     LOG(Network, "CFNet - didReceiveData(conn=%p, handle=%p, bytes=%d) (%s)", conn, handle, length, handle->request().url().url().ascii());
 
-    handle->client()->didReceiveData(handle, (const char*)bytes, length, originalLength);
+    if (handle->client())
+        handle->client()->didReceiveData(handle, (const char*)bytes, length, originalLength);
 }
 
@@ -101 +104 @@
     LOG(Network, "CFNet - didFinishLoading(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().url().ascii());
 
-    handle->client()->didFinishLoading(handle);
+    if (handle->client())
+        handle->client()->didFinishLoading(handle);
 }
 
@@ -110 +114 @@
     LOG(Network, "CFNet - didFail(conn=%p, handle=%p, error = %p) (%s)", conn, handle, error, handle->request().url().url().ascii());
 
-    handle->client()->didFail(handle, ResourceError(error));
+    if (handle->client())
+        handle->client()->didFail(handle, ResourceError(error));
 }
 
@@ -119 +124 @@
     CacheStoragePolicy policy = static_cast<CacheStoragePolicy>(CFCachedURLResponseGetStoragePolicy(cachedResponse));
 
-    handle->client()->willCacheResponse(handle, policy);
+    if (handle->client())
+        handle->client()->willCacheResponse(handle, policy);
 
     if (static_cast<CFURLCacheStoragePolicy>(policy) != CFCachedURLResponseGetStoragePolicy(cachedResponse))
@@ -292 +298 @@
     d->m_currentWebChallenge = AuthenticationChallenge(d->m_currentCFChallenge, this);
     
-    client()->didReceiveAuthenticationChallenge(this, d->m_currentWebChallenge);
+    if (client())
+        client()->didReceiveAuthenticationChallenge(this, d->m_currentWebChallenge);
 }
 
@@ -329 +336 @@
         return;
 
-    client()->receivedCancellation(this, challenge);
+    if (client())
+        client()->receivedCancellation(this, challenge);
 }
 

trunk/WebCore/platform/network/mac/ResourceHandleMac.mm

@@ -265 +265 @@
     d->m_currentWebChallenge = core(webChallenge);
     [webChallenge release];
-    
-    client()->didReceiveAuthenticationChallenge(this, d->m_currentWebChallenge);
+
+    if (client())
+        client()->didReceiveAuthenticationChallenge(this, d->m_currentWebChallenge);
 }
 
@@ -275 +276 @@
     ASSERT(d->m_currentWebChallenge == challenge);
 
-    client()->didCancelAuthenticationChallenge(this, d->m_currentWebChallenge);
+    if (client())
+        client()->didCancelAuthenticationChallenge(this, d->m_currentWebChallenge);
 }
 
@@ -305 +307 @@
         return;
 
-    client()->receivedCancellation(this, challenge);
+    if (client())
+        client()->receivedCancellation(this, challenge);
 }
 
@@ -336 +339 @@
 - (NSURLRequest *)connection:(NSURLConnection *)con willSendRequest:(NSURLRequest *)newRequest redirectResponse:(NSURLResponse *)redirectResponse
 {
-    if (!m_handle)
+    if (!m_handle || !m_handle->client())
         return nil;
     ++inNSURLConnectionCallback;
@@ -385 +388 @@
 - (void)connection:(NSURLConnection *)con didReceiveResponse:(NSURLResponse *)r
 {
-    if (!m_handle)
+    if (!m_handle || !m_handle->client())
         return;
     ++inNSURLConnectionCallback;
@@ -394 +397 @@
 - (void)connection:(NSURLConnection *)con didReceiveData:(NSData *)data lengthReceived:(long long)lengthReceived
 {
-    if (!m_handle)
+    if (!m_handle || !m_handle->client())
         return;
     // FIXME: If we get more than 2B bytes in a single chunk, this code won't do the right thing.
@@ -406 +409 @@
 - (void)connection:(NSURLConnection *)con willStopBufferingData:(NSData *)data
 {
-    if (!m_handle)
+    if (!m_handle || !m_handle->client())
         return;
     // FIXME: If we get a resource with more than 2B bytes, this code won't do the right thing.
@@ -418 +421 @@
 - (void)connectionDidFinishLoading:(NSURLConnection *)con
 {
-    if (!m_handle)
+    if (!m_handle || !m_handle->client())
         return;
     ++inNSURLConnectionCallback;
@@ -427 +430 @@
 - (void)connection:(NSURLConnection *)con didFailWithError:(NSError *)error
 {
-    if (!m_handle)
+    if (!m_handle || !m_handle->client())
         return;
     ++inNSURLConnectionCallback;
@@ -440 +443 @@
         LOG_ERROR("connection:willCacheResponse: was called inside of [NSURLConnection initWithRequest:delegate:] (4067625)");
 #endif
-    if (!m_handle)
+    if (!m_handle || !m_handle->client())
         return nil;
     ++inNSURLConnectionCallback;