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

Fixed bug 4986 - Memory leak in HIDAPI_JoystickConnected 

meyraud705

Memory allocated for device->joysticks on line 589 of SDL_hidapijoystick.c is never freed.

Also, use memmove because memory is overlapping.
This commit is contained in:
Sam Lantinga 2020-02-14 16:15:46 -08:00
parent f4e23553d7
commit 715f8d42a2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/joystick/hidapi/SDL_hidapijoystick.c
View File

@ -616,9 +616,13 @@ HIDAPI_JoystickDisconnected(SDL_HIDAPI_Device *device, SDL_JoystickID joystickID
HIDAPI_JoystickClose(joystick); HIDAPI_JoystickClose(joystick);
} }
SDL_memcpy(&device->joysticks[i], &device->joysticks[i+1], device->num_joysticks - i - 1); SDL_memmove(&device->joysticks[i], &device->joysticks[i+1], device->num_joysticks - i - 1);
--device->num_joysticks; --device->num_joysticks;
--SDL_HIDAPI_numjoysticks; --SDL_HIDAPI_numjoysticks;
if (device->num_joysticks == 0) {
SDL_free(device->joysticks);
device->joysticks = NULL;
}
if (!shutting_down) { if (!shutting_down) {
SDL_PrivateJoystickRemoved(joystickID); SDL_PrivateJoystickRemoved(joystickID);