Skip to content
Permalink
Browse files

Fixes 2356, [Android] SDL_JoystickGetAttached does not function

Also fix a potential NULL pointer access in android/SDL_SYS_JoystickGetGUID
  • Loading branch information
gabomdq committed Jan 21, 2014
1 parent beee1c4 commit b131e74be4923cbb2f8dd271f10c2ef228efb593
Showing with 12 additions and 1 deletion.
  1. +12 −1 src/joystick/android/SDL_sysjoystick.c
@@ -284,6 +284,10 @@ Android_RemoveJoystick(int device_id)
}

const int retval = item->device_instance;
if (item->joystick) {
item->joystick->hwdata = NULL;
}

if (prev != NULL) {
prev->next = item->next;
} else {
@@ -507,7 +511,14 @@ SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )

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 */

0 comments on commit b131e74

Please sign in to comment.