Fix a memory leak in net::CertVerifyProcMac::VerifyInternal

net/cert/cert_verify_proc_mac.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/cert/cert_verify_proc_mac.h"
 
 #include <CommonCrypto/CommonDigest.h>
 #include <CoreServices/CoreServices.h>
 #include <Security/Security.h>
 
@@ skipping 472 matching lines @@
   ScopedCFTypeRef<CFArrayRef> trust_policies;
   OSStatus status = CreateTrustPolicies(hostname, flags, &trust_policies);
   if (status)
     return NetErrorFromOSStatus(status);
 
   // Create and configure a SecTrustRef, which takes our certificate(s)
   // and our SSL SecPolicyRef. SecTrustCreateWithCertificates() takes an
   // array of certificates, the first of which is the certificate we're
   // verifying, and the subsequent (optional) certificates are used for
   // chain building.
-  ScopedCFTypeRef<CFMutableArrayRef> cert_array(CFArrayCreateMutableCopy(
-      kCFAllocatorDefault, 0, cert->CreateOSCertChainForCert()));
+  ScopedCFTypeRef<CFArrayRef> original_chain(cert->CreateOSCertChainForCert());

[davidben, 2015/02/05 22:14:34]

It looks like CreateOSCertChainForCert makes a CFMutableArrayRef anyway (and can
conceivably return NULL but probably takes a malloc error?). Maybe we should
just change the type signature of this function.

https://code.google.com/p/chromium/codesearch#chromium/src/net/cert/x509_cert...

[Ryan Sleevi, 2015/02/05 22:49:40]

I considered that, but we have this same function on windows (which returns a
PCCERT_CONTEXT), and making that ScopedPCCERT_CONTEXT would mean needing to
either include the windows headers or forward declare the free functions.

So for consistency I opted to have both return the native pointer, which feels a
little gross, but less gross than adding more forward declare cruft.

If you feel strongly though, happy to change.

+  ScopedCFTypeRef<CFMutableArrayRef> cert_array(
+      CFArrayCreateMutableCopy(kCFAllocatorDefault, 0, original_chain));
 
   // Serialize all calls that may use the Keychain, to work around various
   // issues in OS X 10.6+ with multi-threaded access to Security.framework.
   base::AutoLock lock(crypto::GetMacSecurityServicesLock());
 
   ScopedCFTypeRef<SecTrustRef> trust_ref;
   SecTrustResultType trust_result = kSecTrustResultDeny;
   ScopedCFTypeRef<CFArrayRef> completed_chain;
   CSSM_TP_APPLE_EVIDENCE_INFO* chain_info = NULL;
   bool candidate_untrusted = true;
@@ skipping 260 matching lines @@
           }
         }
       }
     }
   }
 
   return OK;
 }
 
 }  // namespace net