summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-05 02:30:54 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-05 02:30:54 +0000
commitd2a381b9e1cb93f160c8ecfb9453164269ed36f3 (patch)
tree7dd0af0a0c6d1711b3879c9b5a525b2e2f717eca /chrome/browser
parent586d5826cc4beb322e96a890c740e5a2a665293c (diff)
downloadchromium_src-d2a381b9e1cb93f160c8ecfb9453164269ed36f3.zip
chromium_src-d2a381b9e1cb93f160c8ecfb9453164269ed36f3.tar.gz
chromium_src-d2a381b9e1cb93f160c8ecfb9453164269ed36f3.tar.bz2
Fix null-pointer crash.
BUG=29444 Review URL: http://codereview.chromium.org/469001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/ssl/ssl_policy.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc
index dbdb3cf..3f54b4e 100644
--- a/chrome/browser/ssl/ssl_policy.cc
+++ b/chrome/browser/ssl/ssl_policy.cc
@@ -86,6 +86,9 @@ void SSLPolicy::OnCertError(SSLCertErrorHandler* handler) {
}
void SSLPolicy::DidDisplayInsecureContent(NavigationEntry* entry) {
+ if (!entry)
+ return;
+
// TODO(abarth): We don't actually need to break the whole origin here,
// but we can handle that in a later patch.
DidRunInsecureContent(entry, entry->url().spec());