pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed crash trying to get the GUID of an invalid joystick index

Browse source
This commit is contained in:
Sam Lantinga 2013-06-06 18:20:06 -07:00
parent 0e48e3563b
commit 6879bf00c4
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/joystick/SDL_joystick.c
View file

@ -729,6 +729,12 @@ SDL_PrivateJoystickNeedsPolling()
/* return the guid for this index */ /* return the guid for this index */
SDL_JoystickGUID SDL_JoystickGetDeviceGUID(int device_index) SDL_JoystickGUID SDL_JoystickGetDeviceGUID(int device_index)
{ {
if ((device_index < 0) || (device_index >= SDL_NumJoysticks())) {
SDL_JoystickGUID emptyGUID;
SDL_SetError("There are %d joysticks available", SDL_NumJoysticks());
SDL_zero( emptyGUID );
return emptyGUID;
}
return SDL_SYS_JoystickGetDeviceGUID( device_index ); return SDL_SYS_JoystickGetDeviceGUID( device_index );
} }