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

Fixes 2356, [Android] SDL_JoystickGetAttached does not function 

Also fix a potential NULL pointer access in android/SDL_SYS_JoystickGetGUID
This commit is contained in:
Gabriel Jacobo 2014-01-21 18:20:12 -03:00
parent beee1c4424
commit b131e74be4
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/joystick/android/SDL_sysjoystick.c
View File

@ -284,6 +284,10 @@ Android_RemoveJoystick(int device_id)
} }
const int retval = item->device_instance; const int retval = item->device_instance;
if (item->joystick) {
item->joystick->hwdata = NULL;
}
if (prev != NULL) { if (prev != NULL) {
prev->next = item->next; prev->next = item->next;
} else { } else {
@ -507,7 +511,14 @@ SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick) SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
{ {
return ((SDL_joylist_item*)joystick->hwdata)->guid; SDL_JoystickGUID guid;
if (joystick->hwdata != NULL) {
return ((SDL_joylist_item*)joystick->hwdata)->guid;
}
SDL_zero(guid);
return guid;
} }
#endif /* SDL_JOYSTICK_ANDROID */ #endif /* SDL_JOYSTICK_ANDROID */