Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_pkcs12 / lib / pkcs12Keychain.cpp

diff --git a/OSX/libsecurity_pkcs12/lib/pkcs12Keychain.cpp b/OSX/libsecurity_pkcs12/lib/pkcs12Keychain.cpp
index ce7a3b4f2df23790bc5eb4d9c36139c6375a7df1..b3d0ec8b28d1b8210fd10cb40e11edd1faa94337 100644 (file)
--- a/OSX/libsecurity_pkcs12/lib/pkcs12Keychain.cpp
+++ b/OSX/libsecurity_pkcs12/lib/pkcs12Keychain.cpp
@@ -30,6 +30,7 @@
 #include "pkcs12Utils.h"
 #include "pkcs12Debug.h"
 #include "pkcs12Crypto.h"
 #include "pkcs12Utils.h"
 #include "pkcs12Debug.h"
 #include "pkcs12Crypto.h"

+#include "SecCFRelease.h"

 #include <Security/cssmerr.h>
 #include <security_cdsa_utils/cuDbUtils.h>                     // cuAddCrlToDb()
 #include <security_asn1/nssUtils.h>
 #include <Security/cssmerr.h>
 #include <security_cdsa_utils/cuDbUtils.h>                     // cuAddCrlToDb()
 #include <security_asn1/nssUtils.h>


@@ -305,11 +306,13 @@ void P12Coder::addSecKey(
        for(unsigned i=0; i<attrList->count; i++) {
                SecKeychainAttribute *attr = &attrList->attr[i];
                if(attr->tag == printNameTag) {
        for(unsigned i=0; i<attrList->count; i++) {
                SecKeychainAttribute *attr = &attrList->attr[i];
                if(attr->tag == printNameTag) {

+            CFReleaseNull(friendName);

                        friendName = CFStringCreateWithBytes(NULL, 
                                (UInt8 *)attr->data, attr->length, 
                                kCFStringEncodingUTF8,  false);
                }
                else if(attr->tag == labelHashTag) {
                        friendName = CFStringCreateWithBytes(NULL, 
                                (UInt8 *)attr->data, attr->length, 
                                kCFStringEncodingUTF8,  false);
                }
                else if(attr->tag == labelHashTag) {

+            CFReleaseNull(localKeyId);

                        localKeyId = CFDataCreate(NULL, (UInt8 *)attr->data, attr->length);
                }
                else {
                        localKeyId = CFDataCreate(NULL, (UInt8 *)attr->data, attr->length);
                }
                else {


@@ -401,15 +404,20 @@ void P12Coder::addSecCert(
                SecKeychainAttribute *attr = &attrList->attr[i];
                switch(attr->tag) {
                        case kSecPublicKeyHashItemAttr:
                SecKeychainAttribute *attr = &attrList->attr[i];
                switch(attr->tag) {
                        case kSecPublicKeyHashItemAttr:

+                CFReleaseNull(localKeyId);

                                localKeyId = CFDataCreate(NULL, (UInt8 *)attr->data, attr->length);
                                break;
                        case kSecLabelItemAttr:
                                localKeyId = CFDataCreate(NULL, (UInt8 *)attr->data, attr->length);
                                break;
                        case kSecLabelItemAttr:

+                CFReleaseNull(friendName);

                                /* FIXME: always in UTF8? */
                                friendName = CFStringCreateWithBytes(NULL, 
                                        (UInt8 *)attr->data, attr->length, kCFStringEncodingUTF8,
                                        false);
                                break;
                        default:
                                /* FIXME: always in UTF8? */
                                friendName = CFStringCreateWithBytes(NULL, 
                                        (UInt8 *)attr->data, attr->length, kCFStringEncodingUTF8,
                                        false);
                                break;
                        default:

+                SecKeychainItemFreeAttributesAndData(attrList, certData);
+                CFReleaseNull(friendName);
+                CFReleaseNull(localKeyId);

                                p12ErrorLog("addSecCert: unexpected attr tag\n");
                                MacOSError::throwMe(errSecParam);               
                        
                                p12ErrorLog("addSecCert: unexpected attr tag\n");
                                MacOSError::throwMe(errSecParam);