Commit e53f0736 authored by Chris Araman's avatar Chris Araman Committed by Daniel Stenberg
Browse files

darwinssl: fix CFArrayRef leak 

Reviewed-by: Nick Zitzmann
Closes #1173
parent 8db3afe1

lib/vtls/darwinssl.c

+10 −6
Original line number Diff line number Diff line
@@ -885,12 +885,13 @@ static OSStatus CopyIdentityWithLabel(char *label, 
                                      SecIdentityRef *out_cert_and_key)

{

  OSStatus status = errSecItemNotFound;



#if CURL_BUILD_MAC_10_7 || CURL_BUILD_IOS

  CFArrayRef keys_list;

  CFIndex keys_list_count;

  CFIndex i;

  CFStringRef common_name;



#if CURL_BUILD_MAC_10_7 || CURL_BUILD_IOS

  /* SecItemCopyMatching() was introduced in iOS and Snow Leopard.

     kSecClassIdentity was introduced in Lion. If both exist, let's use them

     to find the certificate. */
@@ -929,32 +930,35 @@ static OSStatus CopyIdentityWithLabel(char *label, 
    if(status == noErr) {

      keys_list_count = CFArrayGetCount(keys_list);

      *out_cert_and_key = NULL;

      status = 1;

      for(i=0; i<keys_list_count; i++) {

        OSStatus err = noErr;

        SecCertificateRef cert = NULL;

        *out_cert_and_key =

        SecIdentityRef identity =

          (SecIdentityRef) CFArrayGetValueAtIndex(keys_list, i);

        err = SecIdentityCopyCertificate(*out_cert_and_key, &cert);

        err = SecIdentityCopyCertificate(identity, &cert);

        if(err == noErr) {

#if CURL_BUILD_IOS

          common_name = SecCertificateCopySubjectSummary(cert);

#else // CURL_BUILD_MAC_10_7

#elif CURL_BUILD_MAC_10_7

          SecCertificateCopyCommonName(cert, &common_name);

#endif

          if(CFStringCompare(common_name, label_cf, 0) == kCFCompareEqualTo) {

            CFRelease(cert);

            CFRelease(common_name);

            CFRetain(identity);

            *out_cert_and_key = identity;

            status = noErr;

            break;

          }

          CFRelease(common_name);

        }

        *out_cert_and_key = NULL;

        status = 1;

        CFRelease(cert);

      }

    }



    if(keys_list)

      CFRelease(keys_list);

    CFRelease(query_dict);

    CFRelease(label_cf);

  }