Browse Source

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.
Sam Lantinga 5 years ago
parent
commit
7ea3f5b464
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/joystick/windows/SDL_xinputjoystick.c

+ 1 - 1
src/joystick/windows/SDL_xinputjoystick.c

@@ -480,7 +480,7 @@ SDL_XINPUT_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble,
     }
 
     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 {
         joystick->hwdata->rumble_expiration = 0;
     }