Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / regressions / si-33-keychain-backup.c

diff --git a/OSX/libsecurity_keychain/regressions/si-33-keychain-backup.c b/OSX/libsecurity_keychain/regressions/si-33-keychain-backup.c
index cdbfc900d2759f8451889c46d694189eac84afcd..0f417e30842269e8d233a01ac1efaa84fd68d4b0 100644 (file)
--- a/OSX/libsecurity_keychain/regressions/si-33-keychain-backup.c
+++ b/OSX/libsecurity_keychain/regressions/si-33-keychain-backup.c
@@ -29,6 +29,7 @@
 #include <Security/SecBase.h>
 #include <Security/SecItem.h>
 #include <Security/SecItemPriv.h>
 #include <Security/SecBase.h>
 #include <Security/SecItem.h>
 #include <Security/SecItemPriv.h>

+#include <utilities/SecCFRelease.h>

 #include <libaks.h>
 #include <AssertMacros.h>
 
 #include <libaks.h>
 #include <AssertMacros.h>
 


@@ -56,15 +57,15 @@ static void tests(void)
     CFNumberRef eighty = CFNumberCreate(NULL, kCFNumberSInt32Type, &v_eighty);
     const char *v_data = "test";
     CFDataRef pwdata = CFDataCreate(NULL, (UInt8 *)v_data, strlen(v_data));
     CFNumberRef eighty = CFNumberCreate(NULL, kCFNumberSInt32Type, &v_eighty);
     const char *v_data = "test";
     CFDataRef pwdata = CFDataCreate(NULL, (UInt8 *)v_data, strlen(v_data));

-    CFMutableDictionaryRef query = CFDictionaryCreateMutable(NULL, 0, NULL, NULL);
+    CFMutableDictionaryRef query = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);

     CFTypeRef result = NULL;
     CFDictionaryAddValue(query, kSecClass, kSecClassInternetPassword);
     CFDictionaryAddValue(query, kSecAttrServer, CFSTR("members.spamcop.net"));
     CFDictionaryAddValue(query, kSecAttrAccount, CFSTR("smith"));
     CFTypeRef result = NULL;
     CFDictionaryAddValue(query, kSecClass, kSecClassInternetPassword);
     CFDictionaryAddValue(query, kSecAttrServer, CFSTR("members.spamcop.net"));
     CFDictionaryAddValue(query, kSecAttrAccount, CFSTR("smith"));

-    CFDictionaryAddValue(query, kSecAttrPort, eighty);
+    CFDictionaryAddValue(query, kSecAttrPort, eighty); CFReleaseNull(eighty);

     CFDictionaryAddValue(query, kSecAttrProtocol, kSecAttrProtocolHTTP);
     CFDictionaryAddValue(query, kSecAttrAuthenticationType, kSecAttrAuthenticationTypeDefault);
     CFDictionaryAddValue(query, kSecAttrProtocol, kSecAttrProtocolHTTP);
     CFDictionaryAddValue(query, kSecAttrAuthenticationType, kSecAttrAuthenticationTypeDefault);

-    CFDictionaryAddValue(query, kSecValueData, pwdata);
+    CFDictionaryAddValue(query, kSecValueData, pwdata); CFReleaseNull(pwdata);

     CFDictionaryAddValue(query, kSecAttrSynchronizable, kCFBooleanTrue);
     
     CFDataRef keybag = NULL;
     CFDictionaryAddValue(query, kSecAttrSynchronizable, kCFBooleanTrue);
     
     CFDataRef keybag = NULL;


@@ -96,8 +97,10 @@ static void tests(void)
     
     ok_status(SecItemDelete(query), "delete restored item");
     
     
     ok_status(SecItemDelete(query), "delete restored item");
     

-    if (backup) { CFRelease(backup); }
-    if (password) { CFRelease(password); }
+    CFReleaseNull(backup);
+    CFReleaseNull(keybag);
+    CFReleaseNull(query);
+    CFReleaseNull(password);

 }
 
 int si_33_keychain_backup(int argc, char *const *argv)
 }
 
 int si_33_keychain_backup(int argc, char *const *argv)