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

Unified Diff: content/browser/ssl/ssl_manager.cc

Issue 1225983003: Clean up the interface to DeserializeSecurityInfo, fix uninitialized memory use. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
Index: content/browser/ssl/ssl_manager.cc
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index 865ca6027a2e631637056b803fff0a9b7f724c20..6f258a7e884132f8565c704151dd462a53c8e96e 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -115,29 +115,10 @@ void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) {
if (details.is_main_frame) {
if (entry) {
- // Decode the security details.
- int ssl_cert_id;
- net::CertStatus ssl_cert_status;
- int ssl_security_bits;
- int ssl_connection_status;
- SignedCertificateTimestampIDStatusList
- ssl_signed_certificate_timestamp_ids;
- DeserializeSecurityInfo(details.serialized_security_info,
- &ssl_cert_id,
- &ssl_cert_status,
- &ssl_security_bits,
- &ssl_connection_status,
- &ssl_signed_certificate_timestamp_ids);
-
// We may not have an entry if this is a navigation to an initial blank
- // page. Reset the SSL information and add the new data we have.
- entry->GetSSL() = SSLStatus();
- entry->GetSSL().cert_id = ssl_cert_id;
- entry->GetSSL().cert_status = ssl_cert_status;
- entry->GetSSL().security_bits = ssl_security_bits;
- entry->GetSSL().connection_status = ssl_connection_status;
- entry->GetSSL().signed_certificate_timestamp_ids =
- ssl_signed_certificate_timestamp_ids;
+ // page. Add the new data we have.
+ entry->GetSSL() =
+ DeserializeSecurityInfo(details.serialized_security_info);
}
}
« no previous file with comments | « no previous file | content/browser/web_contents/web_contents_impl.cc » ('j') | content/common/ssl_status_serialization.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698