Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Unified Diff: net/base/x509_certificate.cc

Issue 7401003: Don't use X509Certificate in SSLConfig. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/ssl_config_service.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/x509_certificate.cc
diff --git a/net/base/x509_certificate.cc b/net/base/x509_certificate.cc
index 5ac75b36b476280b7ba17d2f11743189fe391285..9d36b50c73e3f17fd617dabe2334a2d75d215daa 100644
--- a/net/base/x509_certificate.cc
+++ b/net/base/x509_certificate.cc
@@ -262,14 +262,22 @@ X509Certificate* X509Certificate::CreateFromDERCertChain(
X509Certificate::OSCertHandles intermediate_ca_certs;
for (size_t i = 1; i < der_certs.size(); i++) {
OSCertHandle handle = CreateOSCert(der_certs[i]);
- DCHECK(handle);
+ if (!handle)
+ break;
intermediate_ca_certs.push_back(handle);
}
- OSCertHandle handle = CreateOSCert(der_certs[0]);
- DCHECK(handle);
- X509Certificate* cert = CreateFromHandle(handle, intermediate_ca_certs);
- FreeOSCertHandle(handle);
+ OSCertHandle handle = NULL;
+ // Return NULL if we failed to parse any of the certs.
+ if (der_certs.size() - 1 == intermediate_ca_certs.size())
+ handle = CreateOSCert(der_certs[0]);
+
+ X509Certificate* cert = NULL;
+ if (handle) {
+ cert = CreateFromHandle(handle, intermediate_ca_certs);
+ FreeOSCertHandle(handle);
+ }
+
for (size_t i = 0; i < intermediate_ca_certs.size(); i++)
FreeOSCertHandle(intermediate_ca_certs[i]);
« no previous file with comments | « net/base/ssl_config_service.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698