Changeset 180982 in webkit

Timestamp:

Mar 3, 2015 6:51:16 PM (9 years ago)

Author:

Chris Dumez

Message:

[WK2] Fix memory leak in _getCookieHeadersForTask
​https://bugs.webkit.org/show_bug.cgi?id=142245

Reviewed by Alexey Proskuryakov.

Fix memory leak in _getCookieHeadersForTask. We are leaking the CFDictionary
returned by webKitCookieStorageCopyRequestHeaderFieldsForURL().

This patch addresses the issue by storing the return CFDictionary in a
RetainPtr<CFDictionaryRef>.

• Shared/mac/CookieStorageShim.mm:

(-[WKNSURLSessionLocal _getCookieHeadersForTask:completionHandler:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/mac/CookieStorageShim.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-03  Chris Dumez  <cdumez@apple.com>
+
+        [WK2] Fix memory leak in _getCookieHeadersForTask
+        https://bugs.webkit.org/show_bug.cgi?id=142245
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix memory leak in _getCookieHeadersForTask. We are leaking the CFDictionary
+        returned by webKitCookieStorageCopyRequestHeaderFieldsForURL().
+
+        This patch addresses the issue by storing the return CFDictionary in a
+        RetainPtr<CFDictionaryRef>.
+
+        * Shared/mac/CookieStorageShim.mm:
+        (-[WKNSURLSessionLocal _getCookieHeadersForTask:completionHandler:]):
+
 2015-03-03  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm

@@ -120 +120 @@
     RetainPtr<NSURLSessionTask> strongTask = task;
     CompletionHandlerBlock completionHandlerCopy = [completionHandler copy];
-    RunLoop::main().dispatch([strongTask, completionHandlerCopy]{
-        completionHandlerCopy(WebKit::webKitCookieStorageCopyRequestHeaderFieldsForURL(nullptr, (CFURLRef)[[strongTask currentRequest] URL]));
+    RunLoop::main().dispatch([strongTask, completionHandlerCopy] {
+        RetainPtr<CFDictionaryRef> headers = adoptCF(WebKit::webKitCookieStorageCopyRequestHeaderFieldsForURL(nullptr, (CFURLRef)[[strongTask currentRequest] URL]));
+        completionHandlerCopy(headers.get());
         [completionHandlerCopy release];
     });