diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 22:03:18 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 22:03:18 +0000 |
| commit | b19bc27f555bf42dd6edeba268adebaba91d09f5 (patch) | |
| tree | d936e4256bdea3589225b0e8c24817fef7b704c2 | |
| parent | 1ee21dc6ced2ba01a4ca1faffadea5250a9a3c6e (diff) | |
| download | chromium_src-b19bc27f555bf42dd6edeba268adebaba91d09f5.zip chromium_src-b19bc27f555bf42dd6edeba268adebaba91d09f5.tar.gz chromium_src-b19bc27f555bf42dd6edeba268adebaba91d09f5.tar.bz2 | |
Merge 61007 - [omnibox] Ignore empty search suggestions.
Google search may return empty suggestions for some weird input
characters. We need to ignore them, to avoid breaking the omnibox.
BUG=56214
TEST=(On Mac) In omnibox press option-i and wait for a while. Chrome
shouldn't crash.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=61005
Review URL: http://codereview.chromium.org/3532004
TBR=suzhe@chromium.org
Review URL: http://codereview.chromium.org/3537008
git-svn-id: svn://svn.chromium.org/chrome/branches/517/src@61123 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/autocomplete/search_provider.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index 0ec478c..a13ef3e 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -455,6 +455,12 @@ bool SearchProvider::ParseSuggestResults(Value* root_val, !suggestion_val->GetAsString(&suggestion_str)) return false; + // Google search may return empty suggestions for weird input characters, + // they make no sense at all and can cause problem in our code. + // See http://crbug.com/56214 + if (!suggestion_str.length()) + continue; + Value* type_val; std::string type_str; if (type_list && type_list->Get(i, &type_val) && |