actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Prevent out-of-bounds array access

Browse Source 
Fixes https://github.com/itgmania/itgmania/issues/27
This commit is contained in:
Martin Natano
2022-06-27 20:10:52 +02:00
parent 9b348090a7
commit 61f12e8165
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/InputHandler/InputHandler_MacOSX_HID.mm
+1 -1
View File
@@ -450,7 +450,7 @@ wchar_t InputHandler_MacOSX_HID::DeviceButtonToChar( DeviceButton button, bool b
{ {
CGEventRef event = CGEventCreate(nullptr); CGEventRef event = CGEventCreate(nullptr);
CGEventFlags mods = CGEventGetFlags(event); CGEventFlags mods = CGEventGetFlags(event);
CFRelease(event); CFRelease(event);
UInt32 nModifiers = bUseCurrentKeyModifiers ? (UInt32)mods : 0; UInt32 nModifiers = bUseCurrentKeyModifiers ? (UInt32)mods : 0;
wchar_t sCharCode = KeyCodeToChar( iMacVirtualKey, nModifiers ); wchar_t sCharCode = KeyCodeToChar( iMacVirtualKey, nModifiers );
if( sCharCode != 0 ) if( sCharCode != 0 )
src/archutils/Darwin/KeyboardDevice.cpp
+8 -1
View File
@@ -482,7 +482,14 @@ bool KeyboardDevice::DeviceButtonToMacVirtualKey( DeviceButton button, UInt8 &iM
} }
bInited = true; bInited = true;
} }
iMacVKOut = g_iDeviceButtonToMacVirtualKey[button]; if (button < sizeof(g_iDeviceButtonToMacVirtualKey))
{
iMacVKOut = g_iDeviceButtonToMacVirtualKey[button];
}
else
{
iMacVKOut = 0xFF;
}
return iMacVKOut != 0xFF; return iMacVKOut != 0xFF;
} }