libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 01:38:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SWORD25: Fix out of bounds writes when pressing keys like ctrl or F-keys

Browse Source 
This fixes a crash one got by quitting via the GMM.

svn-id: r53876
This commit is contained in:
Max Horn 2010-10-27 15:15:59 +00:00
parent 9ab69ab6f4
commit b5e41b3a82
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/sword25/input/inputengine.cpp
View File

@ -169,6 +169,7 @@ void InputEngine::testForLeftDoubleClick() {
}
void InputEngine::alterKeyboardState(int keycode, byte newState) {
assert(keycode < ARRAYSIZE(_keyboardState[_currentState]));
_keyboardState[_currentState][keycode] = newState;
}
@ -193,10 +194,12 @@ int InputEngine::getMouseY() {
}
bool InputEngine::isKeyDown(uint keyCode) {
assert(keyCode < ARRAYSIZE(_keyboardState[_currentState]));
return (_keyboardState[_currentState][keyCode] & 0x80) != 0;
}
bool InputEngine::wasKeyDown(uint keyCode) {
assert(keyCode < ARRAYSIZE(_keyboardState[_currentState]));
return ((_keyboardState[_currentState][keyCode] & 0x80) == 0) &&
((_keyboardState[_currentState ^ 1][keyCode] & 0x80) != 0);
}

2
engines/sword25/input/inputengine.h
View File

@ -309,7 +309,7 @@ private:
void testForLeftDoubleClick();
void alterKeyboardState(int keycode, byte newState);
byte _keyboardState[2][256];
byte _keyboardState[2][512];
bool _leftMouseState[2];
bool _rightMouseState[2];
uint _currentState;