Define X509Certificate::intermediate_ca_certs_ as a std::vector of...

net/base/x509_certificate.cc

 // Copyright (c) 2006-2008 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/base/x509_certificate.h"
 
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/time.h"
 
@@ skipping 152 matching lines @@
                                                   int length) {
   OSCertHandle cert_handle = CreateOSCertHandleFromBytes(data, length);
   if (!cert_handle)
     return NULL;
 
   return CreateFromHandle(cert_handle, SOURCE_LONE_CERT_IMPORT);
 }
 
 X509Certificate::X509Certificate(OSCertHandle cert_handle, Source source)
     : cert_handle_(cert_handle),
-#if defined(OS_MACOSX)
-      intermediate_ca_certs_(NULL),
-#endif
       source_(source) {
   Initialize();
 }
 
 X509Certificate::X509Certificate(const std::string& subject,
                                  const std::string& issuer,
                                  base::Time start_date,
                                  base::Time expiration_date)
     : subject_(subject),
       issuer_(issuer),
       valid_start_(start_date),
       valid_expiry_(expiration_date),
       cert_handle_(NULL),
-#if defined(OS_MACOSX)
-      intermediate_ca_certs_(NULL),
-#endif
       source_(SOURCE_UNUSED) {
   memset(fingerprint_.data, 0, sizeof(fingerprint_.data));
 }
 
 X509Certificate::~X509Certificate() {
   // We might not be in the cache, but it is safe to remove ourselves anyway.
   X509Certificate::Cache::GetInstance()->Remove(this);
   if (cert_handle_)
     FreeOSCertHandle(cert_handle_);
-#if defined(OS_MACOSX)
-  if (intermediate_ca_certs_)
-    CFRelease(intermediate_ca_certs_);
+#if defined(OS_MACOSX) || defined(OS_WIN)
+  for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i)
+    FreeOSCertHandle(intermediate_ca_certs_[i]);
 #endif
 }
 
 bool X509Certificate::HasExpired() const {
   return base::Time::Now() > valid_expiry();
 }
 
 }  // namespace net