summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ssl/ssl_policy.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-12 00:17:58 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-12 00:17:58 +0000
commit564a24bec69b3b7c424156ad8cead4b2c7bd5192 (patch)
tree510705c44441564065bf84962f14ecc603804e3e /chrome/browser/ssl/ssl_policy.cc
parent2a9c840f2cd08944889c6c6e663933b592e2adf5 (diff)
downloadchromium_src-564a24bec69b3b7c424156ad8cead4b2c7bd5192.zip
chromium_src-564a24bec69b3b7c424156ad8cead4b2c7bd5192.tar.gz
chromium_src-564a24bec69b3b7c424156ad8cead4b2c7bd5192.tar.bz2
The SSL policy when showing an error page sets the page type on the wrong navigation entry, which can potentially be NULL causing a crasher.
Disabling the setting of page type for the error page, since it is not used. BUG=http://crbug.com/19941 TEST=See steps in the bug. Review URL: http://codereview.chromium.org/193063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26056 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl/ssl_policy.cc')
-rw-r--r--chrome/browser/ssl/ssl_policy.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc
index c8a6c7c..a6ebfb8 100644
--- a/chrome/browser/ssl/ssl_policy.cc
+++ b/chrome/browser/ssl/ssl_policy.cc
@@ -305,8 +305,12 @@ void SSLPolicy::ShowErrorPage(SSLCertErrorHandler* handler) {
true,
handler->request_url(),
security_info);
- tab->controller().GetActiveEntry()->set_page_type(
- NavigationEntry::ERROR_PAGE);
+
+ // TODO(jcampan): we may want to set the navigation entry type to
+ // PageType::ERROR_PAGE. The navigation entry is not available at this point,
+ // it is created when the renderer receives a DidNavigate (triggered by the
+ // LoadAlternateHTMLString above). We'd probably need to pass the page type
+ // along with the security_info.
}
void SSLPolicy::AddMixedContentWarningToConsole(