Changeset 149704 in webkit

Timestamp:

May 7, 2013 6:35:51 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Fix a memory leak introduced in r149692
​https://bugs.webkit.org/show_bug.cgi?id=115766

Patch by Alex Christensen <​achristensen@apple.com> on 2013-05-07
Reviewed by Mark Rowe.

In r149692, the fix for <​http://webkit.org/b/42324>, a call to WKBundleFrameCopyWebArchive was added without any
matching call to WKRelease. An earlier attempted fix in r149697 introduced a RetainPtr but failed to adopt the object.

• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::InjectedBundlePage::dumpDOMAsWebArchive):
Fix the memory leak by switching to WKRetainPtr and adopting the returned object.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-05-07  Alex Christensen  <achristensen@apple.com>
+
+        Fix a memory leak introduced in r149692
+        https://bugs.webkit.org/show_bug.cgi?id=115766
+
+        Reviewed by Mark Rowe.
+
+        In r149692, the fix for <http://webkit.org/b/42324>, a call to WKBundleFrameCopyWebArchive was added without any 
+        matching call to WKRelease. An earlier attempted fix in r149697 introduced a RetainPtr but failed to adopt the object.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::dumpDOMAsWebArchive):
+        Fix the memory leak by switching to WKRetainPtr and adopting the returned object.
+
 2013-05-07  Darin Adler  <darin@apple.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

@@ -846 +846 @@
 {
 #if USE(CF)
-    RetainPtr<WKDataRef> wkData = WKBundleFrameCopyWebArchive(frame);
+    WKRetainPtr<WKDataRef> wkData = adoptWK(WKBundleFrameCopyWebArchive(frame));
     RetainPtr<CFDataRef> cfData = adoptCF(CFDataCreate(0, WKDataGetBytes(wkData.get()), WKDataGetSize(wkData.get())));
     RetainPtr<CFStringRef> cfString = adoptCF(createXMLStringFromWebArchiveData(cfData.get()));