mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-12 09:28:24 +00:00
Code Issues Releases Activity

(w32_wnd_proc, Fw32_reconstruct_hot_key): Range check

Browse Source 
before dereferencing array.
(lookup_vk_code): Remove zero comparison.
This commit is contained in:
Jason Rumney 2007-12-13 15:53:26 +00:00
parent 7d2a95143a
commit bf25403702
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2007-12-13 Jason Rumney <jasonr@gnu.org>
* w32fns.c (w32_wnd_proc, Fw32_reconstruct_hot_key): Range check
before dereferencing array.
(lookup_vk_code): Remove zero comparison.
2007-12-02 Magnus Henoch <mange@freemail.hu>
* process.c (make_process): Initialize pty_flag to 0.

8
src/w32fns.c
View File

@ -2956,7 +2956,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
they don't produce WM_CHAR messages). This ensures that
indicator lights are toggled promptly on Windows 9x, for
example. */
if (lispy_function_keys[wParam] != 0)
if (wParam < 256 && lispy_function_keys[wParam])
{
windows_translate = 1;
goto translate;
@ -3078,7 +3078,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
break;
default:
/* If not defined as a function key, change it to a WM_CHAR message. */
if (lispy_function_keys[wParam] == 0)
if (wParam > 255 || !lispy_function_keys[wParam])
{
DWORD modifiers = construct_console_modifiers ();
@ -8129,7 +8129,7 @@ lookup_vk_code (char *key)
int i;
for (i = 0; i < 256; i++)
if (lispy_function_keys[i] != 0
if (lispy_function_keys[i]
&& strcmp (lispy_function_keys[i], key) == 0)
return i;
@ -8307,7 +8307,7 @@ usage: (w32-reconstruct-hot-key ID) */)
vk_code = HOTKEY_VK_CODE (hotkeyid);
w32_modifiers = HOTKEY_MODIFIERS (hotkeyid);
if (lispy_function_keys[vk_code])
if (vk_code < 256 && lispy_function_keys[vk_code])
key = intern (lispy_function_keys[vk_code]);
else
key = make_number (vk_code);