summaryrefslogtreecommitdiffstats
path: root/chrome/browser/instant
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-02 20:07:49 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-02 20:07:49 +0000
commitb7d061cadc3f33b9b7659475853248fa7141fa87 (patch)
tree836f3a7e36c7b6d04a769ac0d46126044debaf05 /chrome/browser/instant
parent29fe70af3876e3b7cb956cfbbd1226c949e015f8 (diff)
downloadchromium_src-b7d061cadc3f33b9b7659475853248fa7141fa87.zip
chromium_src-b7d061cadc3f33b9b7659475853248fa7141fa87.tar.gz
chromium_src-b7d061cadc3f33b9b7659475853248fa7141fa87.tar.bz2
Work around for a crash. I can't narrow down the circumstances when
this would happen. BUG=64836 TEST=none Review URL: http://codereview.chromium.org/5591001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
-rw-r--r--chrome/browser/instant/instant_loader.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc
index 5e78b5a..a4798a9 100644
--- a/chrome/browser/instant/instant_loader.cc
+++ b/chrome/browser/instant/instant_loader.cc
@@ -194,7 +194,14 @@ class InstantLoader::TabContentsDelegateImpl : public TabContentsDelegate {
tab->UpdateHistoryForNavigation(add_page_vector_[i].get());
NavigationEntry* active_entry = tab->controller().GetActiveEntry();
- DCHECK(active_entry);
+ if (!active_entry) {
+ // It appears to be possible to get here with no active entry. This seems
+ // to be possible with an auth dialog, but I can't narrow down the
+ // circumstances. If you hit this, file a bug with the steps you did and
+ // assign it to me (sky).
+ NOTREACHED();
+ return;
+ }
tab->UpdateHistoryPageTitle(*active_entry);
FaviconService* favicon_service =