We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Diff for fixing leak in SDL2-2.0.12

SDL2-2.0.12_FixXInputJoystickLeak.diff (text/plain), 1.82 KB, created by sdlbugs on 2020-03-17 09:47:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: sdlbugs

Created: 2020-03-17 09:47:54 UTC

Size: 1.82 KB

patch

obsolete

>From ea182df38249dbab723b5a52d6f28d9f360e410a Mon Sep 17 00:00:00 2001
>From: AndySockmonsters <sdlbugs@sockmonsters.com>
>Date: Tue, 17 Mar 2020 09:44:38 +0000
>Subject: [PATCH] - Fixed memory leaks in SDL xinputjoystick.c
>
>---
> .../src/joystick/windows/SDL_xinputjoystick.c          | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/src/joystick/windows/SDL_xinputjoystick.c b/src/joystick/windows/SDL_xinputjoystick.c
>index c863b025..a9890590 100644
>--- a/src/joystick/windows/SDL_xinputjoystick.c
>+++ b/src/joystick/windows/SDL_xinputjoystick.c
>@@ -36,7 +36,7 @@
>  * Internal stuff.
>  */
> static SDL_bool s_bXInputEnabled = SDL_TRUE;
>-static char *s_arrXInputDevicePath[XUSER_MAX_COUNT];
>+static char *s_arrXInputDevicePath[XUSER_MAX_COUNT] = { NULL };
> 
> 
> static SDL_bool
>@@ -155,6 +155,7 @@ GuessXInputDevice(Uint8 userid, Uint16 *pVID, Uint16 *pPID, Uint16 *pVersion)
>                     *pVID = (Uint16)rdi.hid.dwVendorId;
>                     *pPID = (Uint16)rdi.hid.dwProductId;
>                     *pVersion = (Uint16)rdi.hid.dwVersionNumber;
>+                    SDL_free(devices);
>                     return;
>                 }
>             }
>@@ -201,6 +202,7 @@ GuessXInputDevice(Uint8 userid, Uint16 *pVID, Uint16 *pPID, Uint16 *pVersion)
>                     SDL_free(s_arrXInputDevicePath[userid]);
>                 }
>                 s_arrXInputDevicePath[userid] = SDL_strdup(devName);
>+                SDL_free(devices);
>                 return;
>             }
>         }
>@@ -520,6 +522,12 @@ SDL_XINPUT_JoystickClose(SDL_Joystick * joystick)
> void
> SDL_XINPUT_JoystickQuit(void)
> {
>+    int iuserid;
>+
>+    for (iuserid = 0 ; iuserid < XUSER_MAX_COUNT - 1 ; iuserid++) {
>+        DelXInputDevice(iuserid);
>+    }
>+        
>     if (s_bXInputEnabled) {
>         WIN_UnloadXInputDLL();
>     }
>-- 
>2.24.1.windows.2
>

Actions: View | Diff

Attachments on bug 5042: 4265

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.