mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[locale,keyboard] fix missing input validation

This commit is contained in:
akallabeth 2024-09-18 21:15:45 +02:00
parent afde8e779b
commit 7ae1f07aa8
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libfreerdp/locale/keyboard.c
View File

@ -373,7 +373,21 @@ 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))
{
WLog_ERR(TAG, "KeyCode %" PRIu32 " exceeds allowed value range [0,%" PRIuz "]", keycode,
ARRAYSIZE(X11_KEYCODE_TO_VIRTUAL_SCANCODE));
return 0;
}
const DWORD scancode = X11_KEYCODE_TO_VIRTUAL_SCANCODE[keycode];
if (scancode > ARRAYSIZE(REMAPPING_TABLE))
{
WLog_ERR(TAG, "ScanCode %" PRIu32 " exceeds allowed value range [0,%" PRIuz "]", scancode,
ARRAYSIZE(REMAPPING_TABLE));
return 0;
}
const DWORD remapped = REMAPPING_TABLE[scancode];
#if defined(WITH_DEBUG_KBD)
const BOOL ex = RDP_SCANCODE_EXTENDED(scancode);
@ -400,6 +414,13 @@ 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))
{
WLog_ERR(TAG, "ScanCode %" PRIu32 " exceeds allowed value range [0,%" PRIuz "]", scancode,
ARRAYSIZE(VIRTUAL_SCANCODE_TO_X11_KEYCODE));
return 0;
}
const DWORD* x11 = VIRTUAL_SCANCODE_TO_X11_KEYCODE[scancode];
WINPR_ASSERT(x11);