mirror of https://github.com/FreeRDP/FreeRDP
[locale,keyboard] fix index range checks
This commit is contained in:
parent
33fcc04263
commit
ffd40983ac
|
@ -373,7 +373,7 @@ DWORD freerdp_keyboard_init_ex(DWORD keyboardLayoutId, const char* keyboardRemap
|
|||
|
||||
DWORD freerdp_keyboard_get_rdp_scancode_from_x11_keycode(DWORD keycode)
|
||||
{
|
||||
if (keycode > ARRAYSIZE(X11_KEYCODE_TO_VIRTUAL_SCANCODE))
|
||||
if (keycode >= ARRAYSIZE(X11_KEYCODE_TO_VIRTUAL_SCANCODE))
|
||||
{
|
||||
WLog_ERR(TAG, "KeyCode %" PRIu32 " exceeds allowed value range [0,%" PRIuz "]", keycode,
|
||||
ARRAYSIZE(X11_KEYCODE_TO_VIRTUAL_SCANCODE));
|
||||
|
@ -381,7 +381,7 @@ DWORD freerdp_keyboard_get_rdp_scancode_from_x11_keycode(DWORD keycode)
|
|||
}
|
||||
|
||||
const DWORD scancode = X11_KEYCODE_TO_VIRTUAL_SCANCODE[keycode];
|
||||
if (scancode > ARRAYSIZE(REMAPPING_TABLE))
|
||||
if (scancode >= ARRAYSIZE(REMAPPING_TABLE))
|
||||
{
|
||||
WLog_ERR(TAG, "ScanCode %" PRIu32 " exceeds allowed value range [0,%" PRIuz "]", scancode,
|
||||
ARRAYSIZE(REMAPPING_TABLE));
|
||||
|
@ -414,7 +414,7 @@ DWORD freerdp_keyboard_get_rdp_scancode_from_x11_keycode(DWORD keycode)
|
|||
|
||||
DWORD freerdp_keyboard_get_x11_keycode_from_rdp_scancode(DWORD scancode, BOOL extended)
|
||||
{
|
||||
if (scancode > ARRAYSIZE(VIRTUAL_SCANCODE_TO_X11_KEYCODE))
|
||||
if (scancode >= ARRAYSIZE(VIRTUAL_SCANCODE_TO_X11_KEYCODE))
|
||||
{
|
||||
WLog_ERR(TAG, "ScanCode %" PRIu32 " exceeds allowed value range [0,%" PRIuz "]", scancode,
|
||||
ARRAYSIZE(VIRTUAL_SCANCODE_TO_X11_KEYCODE));
|
||||
|
|
Loading…
Reference in New Issue