diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-06 21:31:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-06 21:31:06 +0000 |
| commit | d7bb1f68d48f5939c9579fbfacd82389096b776c (patch) | |
| tree | f73435df6c06cd600ea89a55575ff3e7dae4d451 /webkit | |
| parent | e411d0e99212aca1d30366c82a9266a58bfadd98 (diff) | |
| download | chromium_src-d7bb1f68d48f5939c9579fbfacd82389096b776c.zip chromium_src-d7bb1f68d48f5939c9579fbfacd82389096b776c.tar.gz chromium_src-d7bb1f68d48f5939c9579fbfacd82389096b776c.tar.bz2 | |
Add a terminating NULL to the text read from the edit control. This doesn't work
on Vista. Apparently EM_GETLINE doesn't guarantee a terminating NULL.
BUG=6053
Review URL: http://codereview.chromium.org/16551
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_win.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index c904102..6a8e9b2 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -650,11 +650,13 @@ LRESULT CALLBACK TestShell::EditWndProc(HWND hwnd, UINT message, switch (message) { case WM_CHAR: if (wParam == VK_RETURN) { - wchar_t strPtr[MAX_URL_LENGTH]; + wchar_t strPtr[MAX_URL_LENGTH + 1]; // Leave room for adding a NULL; *((LPWORD)strPtr) = MAX_URL_LENGTH; LRESULT strLen = SendMessage(hwnd, EM_GETLINE, 0, (LPARAM)strPtr); - if (strLen > 0) + if (strLen > 0) { + strPtr[strLen] = 0; // EM_GETLINE doesn't NULL terminate. shell->LoadURL(strPtr); + } return 0; } |