summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-21 02:43:48 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-21 02:43:48 +0000
commit667590417c75ce8288a40c17d3310d72fe154662 (patch)
treeccb290e16bb8c7d477383aa2fdd5212aaa93bd91 /chrome
parent3e08fbd845176bed23795508b59f52c06ce26c51 (diff)
downloadchromium_src-667590417c75ce8288a40c17d3310d72fe154662.zip
chromium_src-667590417c75ce8288a40c17d3310d72fe154662.tar.gz
chromium_src-667590417c75ce8288a40c17d3310d72fe154662.tar.bz2
DCHECK(result) keeps firing in AutocompleteHistoryManager::OnWebDataServiceRequestDone()
A NULL |result| should DCHECK, but not crash. This is a short term solution to the top-crasher, will still DCHECK for devs while a longer term fix is determined. BUG=68783, 69833 TEST=none Review URL: http://codereview.chromium.org/6275011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/autocomplete_history_manager.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete_history_manager.cc b/chrome/browser/autocomplete_history_manager.cc
index 40d8c72..31a6e05 100644
--- a/chrome/browser/autocomplete_history_manager.cc
+++ b/chrome/browser/autocomplete_history_manager.cc
@@ -175,6 +175,14 @@ void AutocompleteHistoryManager::OnWebDataServiceRequestDone(
}
DCHECK(result);
+ // Returning early here if |result| is NULL. We've seen this happen on
+ // Linux due to NFS dismounting and causing sql failures.
+ // See http://crbug.com/68783.
+ if (!result) {
+ SendSuggestions(NULL);
+ return;
+ }
+
DCHECK(result->GetType() == AUTOFILL_VALUE_RESULT);
const WDResult<std::vector<string16> >* autofill_result =
static_cast<const WDResult<std::vector<string16> >*>(result);