encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 4898 - No rumble because of integer overflow in SDL_JoystickRumble 

meyraud705

Switch hidapi and xinput also need to check for overflow, attached a patch for them.
This commit is contained in:
Sam Lantinga 2020-01-26 12:48:35 -08:00
parent 5e649983e7
commit 7ea3f5b464
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/joystick/windows/SDL_xinputjoystick.c
View File

@ -480,7 +480,7 @@ SDL_XINPUT_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble,
} }
if ((low_frequency_rumble || high_frequency_rumble) && duration_ms) { if ((low_frequency_rumble || high_frequency_rumble) && duration_ms) {
joystick->hwdata->rumble_expiration = SDL_GetTicks() + duration_ms; joystick->hwdata->rumble_expiration = SDL_GetTicks() + SDL_min(duration_ms, SDL_MAX_RUMBLE_DURATION_MS);
} else { } else {
joystick->hwdata->rumble_expiration = 0; joystick->hwdata->rumble_expiration = 0;
} }