Changeset 21952 in webkit

Timestamp:

Jun 1, 2007 7:37:45 PM (17 years ago)

Author:

andersca

Message:

Reviewed by David Harrison.

<rdar://problem/5236843>
CrashTracer: [USER] 3 crashes in Mail at WebCore::Loader::didReceiveResponse(WebCore::SubresourceLoader*, WebCore::ResourceResponse const&)

This is by no means the best solution for handling user style sheets. I've filed <rdar://problem/5244734>
for tracking that.

• loader/loader.cpp: (WebCore::Loader::didReceiveResponse): If a load starts while the frame is still in the provisional state (this can be the case when loading the user style sheet), committing the load then causes all requests to be removed from the m_requestsLoading map. This means that req might be null here. In that case we just return early.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/loader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-06-01  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by David Harrison.
+
+        <rdar://problem/5236843> 
+        CrashTracer: [USER] 3 crashes in Mail at WebCore::Loader::didReceiveResponse(WebCore::SubresourceLoader*, WebCore::ResourceResponse const&)
+
+        This is by no means the best solution for handling user style sheets. I've filed <rdar://problem/5244734> 
+        for tracking that.
+        
+        * loader/loader.cpp:
+        (WebCore::Loader::didReceiveResponse):
+        If a load starts while the frame is still in the provisional state 
+        (this can be the case when loading the user style sheet), committing the load then causes all
+        requests to be removed from the m_requestsLoading map. This means that req might be null here.
+        In that case we just return early. 
+        
 2007-06-01  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/loader/loader.cpp

@@ -158 +158 @@
 {
     Request* req = m_requestsLoading.get(loader);
-    ASSERT(req);
+    
+    // FIXME: This is a workaround for <rdar://problem/5236843>
+    // If a load starts while the frame is still in the provisional state 
+    // (this can be the case when loading the user style sheet), committing the load then causes all
+    // requests to be removed from the m_requestsLoading map. This means that req might be null here.
+    // In that case we just return early. 
+    // ASSERT(req);
+    if (!req)
+        return;
     req->cachedResource()->setResponse(response);