mirror of
				https://github.com/libsdl-org/SDL.git
				synced 2025-10-26 12:27:44 +00:00 
			
		
		
		
	joystick/vita: add some sanity check to SDL_GetJoystickInstanceID result
Reference issue: https://github.com/libsdl-org/SDL/issues/7051
This commit is contained in:
		| @@ -321,8 +321,11 @@ static int VITA_JoystickRumble(SDL_Joystick *joystick, Uint16 low_frequency_rumb | |||||||
| { | { | ||||||
|     int index = (int)SDL_GetJoystickInstanceID(joystick) - 1; |     int index = (int)SDL_GetJoystickInstanceID(joystick) - 1; | ||||||
|     SceCtrlActuator act; |     SceCtrlActuator act; | ||||||
|     SDL_zero(act); |  | ||||||
|  |  | ||||||
|  |     if (index < 0 || index > 3) { | ||||||
|  |         return -1; | ||||||
|  |     } | ||||||
|  |     SDL_zero(act); | ||||||
|     act.small = high_frequency_rumble / 256; |     act.small = high_frequency_rumble / 256; | ||||||
|     act.large = low_frequency_rumble / 256; |     act.large = low_frequency_rumble / 256; | ||||||
|     if (sceCtrlSetActuator(ext_port_map[index], &act) < 0) { |     if (sceCtrlSetActuator(ext_port_map[index], &act) < 0) { | ||||||
| @@ -345,6 +348,9 @@ static Uint32 VITA_JoystickGetCapabilities(SDL_Joystick *joystick) | |||||||
| static int VITA_JoystickSetLED(SDL_Joystick *joystick, Uint8 red, Uint8 green, Uint8 blue) | static int VITA_JoystickSetLED(SDL_Joystick *joystick, Uint8 red, Uint8 green, Uint8 blue) | ||||||
| { | { | ||||||
|     int index = (int)SDL_GetJoystickInstanceID(joystick) - 1; |     int index = (int)SDL_GetJoystickInstanceID(joystick) - 1; | ||||||
|  |     if (index < 0 || index > 3) { | ||||||
|  |         return -1; | ||||||
|  |     } | ||||||
|     if (sceCtrlSetLightBar(ext_port_map[index], red, green, blue) < 0) { |     if (sceCtrlSetLightBar(ext_port_map[index], red, green, blue) < 0) { | ||||||
|         return SDL_Unsupported(); |         return SDL_Unsupported(); | ||||||
|     } |     } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Ozkan Sezer
					Ozkan Sezer