diff options
| author | estark <estark@chromium.org> | 2015-07-13 17:06:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-14 00:07:21 +0000 |
| commit | a5635c454db2a79dac54e6c5d4bca25dc9f35897 (patch) | |
| tree | 744992acdfd583e24935d3067e4ed0c31ffb466b /content/browser/ssl | |
| parent | 7b2a217751cdfbcfcf6dcf9793cb428082939da7 (diff) | |
| download | chromium_src-a5635c454db2a79dac54e6c5d4bca25dc9f35897.zip chromium_src-a5635c454db2a79dac54e6c5d4bca25dc9f35897.tar.gz chromium_src-a5635c454db2a79dac54e6c5d4bca25dc9f35897.tar.bz2 | |
Kill renderer on failure to deserialize security info in most cases
This CL adds a bool return value to DeserializeSecurityInfo() to
indicate if the information could be deserialized, and also adds a basic
sanity check to one of the deserialized values (|security_bits|).
In most places where security info is deserialized, this CL kills the
renderer if deserialization fails. The remaining place that this CL
doesn't handle is when the renderer passes ContextMenuParams to the
browser; this case requires a little more refactoring because the
renderer does the deserialization and passes the deserialized SSLStatus
to the browser.
Follow-up to https://codereview.chromium.org/1225983003/
BUG=508232
Review URL: https://codereview.chromium.org/1230003004
Cr-Commit-Position: refs/heads/master@{#338600}
Diffstat (limited to 'content/browser/ssl')
| -rw-r--r-- | content/browser/ssl/ssl_manager.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc index 6f258a7..ab1048c 100644 --- a/content/browser/ssl/ssl_manager.cc +++ b/content/browser/ssl/ssl_manager.cc @@ -117,8 +117,7 @@ void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) { if (entry) { // We may not have an entry if this is a navigation to an initial blank // page. Add the new data we have. - entry->GetSSL() = - DeserializeSecurityInfo(details.serialized_security_info); + entry->GetSSL() = details.ssl_status; } } |