From 69cdc95932f5f1dad774f5692037e4a0fdb311cd Mon Sep 17 00:00:00 2001 From: Nick Zitzmann Date: Wed, 14 May 2014 17:48:14 -0500 Subject: darwinssl: fix potential crash when attempting to copy an identity from a P12 file This could've happened if SecPKCS12Import() returned noErr _and_ no identity. --- lib/vtls/curl_darwinssl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/vtls/curl_darwinssl.c b/lib/vtls/curl_darwinssl.c index 3a9da91cc..3627963dd 100644 --- a/lib/vtls/curl_darwinssl.c +++ b/lib/vtls/curl_darwinssl.c @@ -952,7 +952,7 @@ static OSStatus CopyIdentityFromPKCS12File(const char *cPath, /* Here we go: */ status = SecPKCS12Import(pkcs_data, options, &items); - if(status == noErr) { + if(status == noErr && items && CFArrayGetCount(items)) { CFDictionaryRef identity_and_trust = CFArrayGetValueAtIndex(items, 0L); const void *temp_identity = CFDictionaryGetValue(identity_and_trust, kSecImportItemIdentity); @@ -960,8 +960,10 @@ static OSStatus CopyIdentityFromPKCS12File(const char *cPath, /* Retain the identity; we don't care about any other data... */ CFRetain(temp_identity); *out_cert_and_key = (SecIdentityRef)temp_identity; - CFRelease(items); } + + if(items) + CFRelease(items); CFRelease(options); CFRelease(pkcs_data); } -- cgit v1.2.1