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

libsdl-org · Jun 7, 2013 · c6b0309 · c6b0309
1 parent 68ff282
commit c6b0309
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
@@ -729,6 +729,12 @@ SDL_PrivateJoystickNeedsPolling()
 /* return the guid for this 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 );
 }