Fix leak in SDL_GameControllerTypeForIndex()

Sackzement · slouken · commit 6e5cad8e1eb4 · 2025-11-01T08:40:37.000-07:00
(cherry picked from commit 398bacb)
diff --git a/src/joystick/SDL_gamecontroller.c b/src/joystick/SDL_gamecontroller.c
@@ -1984,7 +1984,7 @@ const char *SDL_GameControllerPathForIndex(int joystick_index)
 SDL_GameControllerType SDL_GameControllerTypeForIndex(int joystick_index)
 {
     SDL_JoystickGUID joystick_guid = SDL_JoystickGetDeviceGUID(joystick_index);
-    const char *mapping = SDL_GameControllerMappingForGUID(joystick_guid);
+    char *mapping = SDL_GameControllerMappingForGUID(joystick_guid);
     char *type_string, *comma;
     SDL_GameControllerType type;
     if (mapping) {
@@ -1999,8 +1999,10 @@ SDL_GameControllerType SDL_GameControllerTypeForIndex(int joystick_index)
             } else {
                 type = SDL_GetGameControllerTypeFromString(type_string);
             }
+            SDL_free(mapping);
             return type;
         }
+        SDL_free(mapping);
     }
     return SDL_GetJoystickGameControllerTypeFromGUID(joystick_guid, SDL_JoystickNameForIndex(joystick_index));
 }

Original file line number	Diff line number	Diff line change
`@@ -1984,7 +1984,7 @@ const char *SDL_GameControllerPathForIndex(int joystick_index)`
`1984`	`1984`	`SDL_GameControllerType SDL_GameControllerTypeForIndex(int joystick_index)`
`1985`	`1985`	`{`
`1986`	`1986`	`SDL_JoystickGUID joystick_guid = SDL_JoystickGetDeviceGUID(joystick_index);`
`1987`		`- const char *mapping = SDL_GameControllerMappingForGUID(joystick_guid);`
	`1987`	`+ char *mapping = SDL_GameControllerMappingForGUID(joystick_guid);`
`1988`	`1988`	`char type_string, comma;`
`1989`	`1989`	`SDL_GameControllerType type;`
`1990`	`1990`	`if (mapping) {`
`@@ -1999,8 +1999,10 @@ SDL_GameControllerType SDL_GameControllerTypeForIndex(int joystick_index)`
`1999`	`1999`	`} else {`
`2000`	`2000`	`type = SDL_GetGameControllerTypeFromString(type_string);`
`2001`	`2001`	`}`
	`2002`	`+ SDL_free(mapping);`
`2002`	`2003`	`return type;`
`2003`	`2004`	`}`
	`2005`	`+ SDL_free(mapping);`
`2004`	`2006`	`}`
`2005`	`2007`	`return SDL_GetJoystickGameControllerTypeFromGUID(joystick_guid, SDL_JoystickNameForIndex(joystick_index));`
`2006`	`2008`	`}`