mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-06-24 21:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix buffer overflow in KeyboardLayoutManager::GetKeyMap()

Browse Source
This commit is contained in:
Stefanie Jane
2026-06-22 18:49:53 -07:00
committed by Adam Honse
parent 73865fec59
commit 39343c3e9e
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
KeyboardLayoutManager/KeyboardLayoutManager.cpp
View File

@@ -1012,8 +1012,20 @@ void KeyboardLayoutManager::GetKeyMap(unsigned int* map_ptr, KEYBOARD_MAP_FILL_T
void KeyboardLayoutManager::GetKeyMap(unsigned int* map_ptr, KEYBOARD_MAP_FILL_TYPE fill_type, uint8_t height = 0, uint8_t width = 0)
{
unsigned int no_key = -1;
width = std::max(width, cols);
height = std::max(height, rows);
/*-------------------------------------------------------------------------*\
| If explicit dimensions are passed (non-zero), use them as-is. |
| Only fall back to internal dimensions when zero is passed. |
| This ensures we don't write beyond the caller's allocated buffer. |
\*-------------------------------------------------------------------------*/
if(width == 0)
{
width = cols;
}
if(height == 0)
{
height = rows;
}
for(unsigned int r = 0; r < height; r++)
{
@@ -1027,6 +1039,14 @@ void KeyboardLayoutManager::GetKeyMap(unsigned int* map_ptr, KEYBOARD_MAP_FILL_T
for(unsigned int i = 0; i < (unsigned int)keymap.size(); i++)
{
/*---------------------------------------------------------------------*\
| Skip keys that fall outside the requested map dimensions |
\*---------------------------------------------------------------------*/
if(keymap[i].row >= height || keymap[i].col >= width)
{
continue;
}
unsigned int offset = (keymap[i].row * width) + keymap[i].col;
switch(fill_type)
{