Title: [149828] trunk/Source/WebCore
Revision
149828
Author
da...@apple.com
Date
2013-05-09 11:42:49 -0700 (Thu, 09 May 2013)

Log Message

[Mac] CFError leak under Objective-C garbage collection
https://bugs.webkit.org/show_bug.cgi?id=115862

Reviewed by Benjamin Poulain.

* platform/network/mac/ResourceErrorMac.mm:
(WebCore::ResourceError::nsError): Use adoptCF instead of adoptNS since
the CFError needs a CFRelease, not an -[NSObject release].

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (149827 => 149828)


--- trunk/Source/WebCore/ChangeLog	2013-05-09 18:38:37 UTC (rev 149827)
+++ trunk/Source/WebCore/ChangeLog	2013-05-09 18:42:49 UTC (rev 149828)
@@ -1,3 +1,14 @@
+2013-05-09  Darin Adler  <da...@apple.com>
+
+        [Mac] CFError leak under Objective-C garbage collection
+        https://bugs.webkit.org/show_bug.cgi?id=115862
+
+        Reviewed by Benjamin Poulain.
+
+        * platform/network/mac/ResourceErrorMac.mm:
+        (WebCore::ResourceError::nsError): Use adoptCF instead of adoptNS since
+        the CFError needs a CFRelease, not an -[NSObject release].
+
 2013-05-09  Alberto Garcia  <agar...@igalia.com>
 
         BlackBerry: fix call to PluginLayerWebKitThread::setHolePunchRect()

Modified: trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm (149827 => 149828)


--- trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm	2013-05-09 18:38:37 UTC (rev 149827)
+++ trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm	2013-05-09 18:42:49 UTC (rev 149828)
@@ -76,8 +76,8 @@
 
     if (m_platformError) {
         CFErrorRef error = m_platformError.get();
-        RetainPtr<NSDictionary> userInfo = adoptNS((NSDictionary *) CFErrorCopyUserInfo(error));
-        m_platformNSError = adoptNS([[NSError alloc] initWithDomain:(NSString *)CFErrorGetDomain(error) code:CFErrorGetCode(error) userInfo:userInfo.get()]);
+        RetainPtr<CFDictionaryRef> userInfo = adoptCF(CFErrorCopyUserInfo(error));
+        m_platformNSError = adoptNS([[NSError alloc] initWithDomain:(NSString *)CFErrorGetDomain(error) code:CFErrorGetCode(error) userInfo:(NSDictionary *)userInfo.get()]);
         return m_platformNSError.get();
     }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to