From fa4ee514390f8aadfac40cd3324f27019dded2e7 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 18 Jan 2013 22:46:51 +0000 Subject: [PATCH] Merge revision 1045 changes: - Windows: Avoid assertion when entering zero-length text in the default JavaScript prompt dialog (issue #862). git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1180@1048 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef3/libcef/browser/javascript_dialog_win.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cef3/libcef/browser/javascript_dialog_win.cc b/cef3/libcef/browser/javascript_dialog_win.cc index 14f5eabbe..66a4894b9 100644 --- a/cef3/libcef/browser/javascript_dialog_win.cc +++ b/cef3/libcef/browser/javascript_dialog_win.cc @@ -61,8 +61,10 @@ INT_PTR CALLBACK CefJavaScriptDialog::DialogProc(HWND dialog, if (owner->message_type_ == content::JAVASCRIPT_MESSAGE_TYPE_PROMPT) { size_t length = GetWindowTextLength(GetDlgItem(dialog, IDC_PROMPTEDIT)) + 1; - GetDlgItemText(dialog, IDC_PROMPTEDIT, - WriteInto(&user_input, length), length); + if (length > 1) { + GetDlgItemText(dialog, IDC_PROMPTEDIT, + WriteInto(&user_input, length), length); + } } break; case IDCANCEL: