diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 06:16:13 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 06:16:13 +0000 |
| commit | d7a32a466ca021ff8f7a36c8de481d23b1fb9c67 (patch) | |
| tree | a9118c42fb8986622b100bae0bf546890ecbcc47 /chrome/browser/ssl | |
| parent | 7c783c90cf1d212296542f7b5cdd7155e0d9b47f (diff) | |
| download | chromium_src-d7a32a466ca021ff8f7a36c8de481d23b1fb9c67.zip chromium_src-d7a32a466ca021ff8f7a36c8de481d23b1fb9c67.tar.gz chromium_src-d7a32a466ca021ff8f7a36c8de481d23b1fb9c67.tar.bz2 | |
Fix crash when updating a navigation entry without a site_instance.
R=creis
BUG=http://crbug.com/12423
Review URL: http://codereview.chromium.org/115695
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_policy.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc index 3bf64e5..aefcf14 100644 --- a/chrome/browser/ssl/ssl_policy.cc +++ b/chrome/browser/ssl/ssl_policy.cc @@ -170,8 +170,13 @@ void SSLPolicy::UpdateEntry(NavigationEntry* entry) { return; } - if (backend_->DidMarkHostAsBroken(entry->url().host(), - entry->site_instance()->GetProcess()->pid())) + SiteInstance* site_instance = entry->site_instance(); + // Note that |site_instance| can be NULL here because NavigationEntries don't + // necessarily have site instances. Without a process, the entry can't + // possibly have mixed content. See bug http://crbug.com/12423. + if (site_instance && + backend_->DidMarkHostAsBroken(entry->url().host(), + site_instance->GetProcess()->pid())) entry->ssl().set_has_mixed_content(); } |