Changeset 94398 in webkit

Timestamp:

Sep 2, 2011, 3:21:56 AM (14 years ago)

Author:

mrowe@apple.com

Message:

<​http://webkit.org/b/67467> WebProcessProxy::secItemCopyMatching / WebProcessProxy::secItemAdd
leak the results of the APIs they wrap.

Reviewed by Dan Bernstein.

• UIProcess/mac/WebProcessProxyMac.mm:

(WebKit::WebProcessProxy::secItemCopyMatching): Adopt the result of SecItemCopyMatching in to a
RetainPtr to ensure it gets released at the appropriate time.
(WebKit::WebProcessProxy::secItemAdd): Ditto for SecItemAdd.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WebProcessProxyMac.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-09-02  Mark Rowe  <mrowe@apple.com>
+
+        <http://webkit.org/b/67467> WebProcessProxy::secItemCopyMatching / WebProcessProxy::secItemAdd
+        leak the results of the APIs they wrap.
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/mac/WebProcessProxyMac.mm:
+        (WebKit::WebProcessProxy::secItemCopyMatching): Adopt the result of SecItemCopyMatching in to a
+        RetainPtr to ensure it gets released at the appropriate time.
+        (WebKit::WebProcessProxy::secItemAdd): Ditto for SecItemAdd.
+
 2011-09-01  Ada Chan  <adachan@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm

@@ -38 +38 @@
 {
     CFDictionaryRef query = queryData.query();
-    CFTypeRef resultObject;
-    OSStatus resultCode;
+    CFTypeRef resultObjectRef;
+    OSStatus resultCode = SecItemCopyMatching(query, &resultObjectRef);
 
-    resultCode = SecItemCopyMatching(query, &resultObject);
-
-    result = SecItemResponseData(resultCode, resultObject);
+    RetainPtr<CFTypeRef> resultObject(AdoptCF, resultObjectRef);
+    result = SecItemResponseData(resultCode, resultObject.get());
 }
 
@@ -49 +48 @@
 {
     CFDictionaryRef query = queryData.query();
-    CFTypeRef resultObject;
-    OSStatus resultCode;
+    CFTypeRef resultObjectRef;
+    OSStatus resultCode = SecItemAdd(query, &resultObjectRef);
 
-    resultCode = SecItemAdd(query, &resultObject);
-
-    result = SecItemResponseData(resultCode, resultObject);
+    RetainPtr<CFTypeRef> resultObject(AdoptCF, resultObjectRef);
+    result = SecItemResponseData(resultCode, resultObject.get());
 }