Index: chrome/browser/ui/views/omnibox/omnibox_view_win.cc |
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc |
index 806cd51e3d1e9bffe39848c063d83bac3d50d247..089503d2f4d8c4649f20e9c175551ab31e40b9d6 100644 |
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc |
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc |
@@ -611,6 +611,9 @@ void OmniboxViewWin::OpenMatch(const AutocompleteMatch& match, |
string16 OmniboxViewWin::GetText() const { |
const int len = GetTextLength() + 1; |
+ if (len <= 1) |
+ return string16(); |
+ |
string16 str; |
GetWindowText(WriteInto(&str, len), len); |
return str; |
@@ -2109,6 +2112,8 @@ string16 OmniboxViewWin::GetSelectedText() const { |
// Figure out the length of the selection. |
CHARRANGE sel; |
GetSel(sel); |
+ if (sel.cpMin == sel.cpMax) // GetSelText() crashes on NULL input. |
+ return string16(); |
// Grab the selected text. |
string16 str; |