Changeset 85984 in webkit

Timestamp:

May 6, 2011 4:06:02 PM (13 years ago)

Author:

Martin Robinson

Message:

2011-05-06 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[Soup] ResourceHandles are leaked on 304 responses
​https://bugs.webkit.org/show_bug.cgi?id=60413

Always call cleanupSoupRequestOperation, even when the request was not
canceled. Before the code would call didFinishLoading and then never clean up
the request.

No new tests. This simply fixes a memory leak.

• platform/network/soup/ResourceHandleSoup.cpp: (WebCore::sendRequestCallback):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/soup/ResourceHandleSoup.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-06  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [Soup] ResourceHandles are leaked on 304 responses
+        https://bugs.webkit.org/show_bug.cgi?id=60413
+
+        Always call cleanupSoupRequestOperation, even when the request was not
+        canceled. Before the code would call didFinishLoading and then never clean up
+        the request.
+
+        No new tests. This simply fixes a memory leak.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::sendRequestCallback):
+
 2011-05-06  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -469 +469 @@
         }
 
-        // didReceiveData above might have cancelled it
-        if (d->m_cancelled || !client) {
-            cleanupSoupRequestOperation(handle.get());
-            return;
-        }
-
-        client->didFinishLoading(handle.get(), 0);
+        // didReceiveData above might have canceled this operation. If not, inform the client we've finished loading.
+        if (!d->m_cancelled && client)
+            client->didFinishLoading(handle.get(), 0);
+
+        cleanupSoupRequestOperation(handle.get());
         return;
     }