Changeset 99558 in vbox

Timestamp:

Apr 28, 2023 1:54:03 PM (19 months ago)

Author:

vboxsync

Message:

DevPS2K/UsbKbd: Improved range checks.

Location:

trunk/src/VBox/Devices/Input

Files:

• DevPS2K.cpp (modified) (1 diff)
• UsbKbd.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Input/DevPS2K.cpp

@@ -406 +406 @@
 
 #define PS2K_PAGE_DC_START      0xb0
-#define PS2K_PAGE_DC_END        (PS2K_PAGE_DC_START + RT_ELEMENTS(aPS2DCKeys))
+#define PS2K_PAGE_DC_END        (PS2K_PAGE_DC_START + RT_ELEMENTS(aPS2DCKeys) - 1)
 #define PS2K_PAGE_CC_START      0xc0
-#define PS2K_PAGE_CC_END        (PS2K_PAGE_CC_START + RT_ELEMENTS(aPS2CCKeys))
+#define PS2K_PAGE_CC_END        (PS2K_PAGE_CC_START + RT_ELEMENTS(aPS2CCKeys) - 1)
 
 AssertCompile(RT_ELEMENTS(aPS2CCKeys) <= 0x20); /* Must fit between 0xC0-0xDF. */

trunk/src/VBox/Devices/Input/UsbKbd.cpp

@@ -656 +656 @@
 
 #define USBHID_PAGE_DC_START    0xb0
-#define USBHID_PAGE_DC_END      (USBHID_PAGE_DC_START + RT_ELEMENTS(aHidDCKeys))
+#define USBHID_PAGE_DC_END      (USBHID_PAGE_DC_START + RT_ELEMENTS(aHidDCKeys) - 1)
 #define USBHID_PAGE_CC_START    0xc0
-#define USBHID_PAGE_CC_END      (USBHID_PAGE_CC_START + RT_ELEMENTS(aHidCCKeys))
+#define USBHID_PAGE_CC_END      (USBHID_PAGE_CC_START + RT_ELEMENTS(aHidCCKeys) - 1)
 
 AssertCompile(RT_ELEMENTS(aHidCCKeys) <= 0x20); /* Must fit between 0xC0-0xDF. */