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

fix_memory_leaks.patch (text/plain), 1.95 KB, created by Dmitry Gapkalov on 2019-06-18 16:53:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Gapkalov

Created: 2019-06-18 16:53:59 UTC

Size: 1.95 KB

patch

obsolete

># HG changeset patch
># User Dmitry Gapkalov
># Date 1560876517 14400
>#      Tue Jun 18 12:48:37 2019 -0400
># Node ID ba92e33951e2c6f3078ccf36f79f83ffb46f3cae
># Parent  f92b7ee0dec374e3f9072f21820c9d6e8374e18b
>fix memory leaks in SDL_envmem and SDL_TLSData
>
>diff -r f92b7ee0dec3 -r ba92e33951e2 src/SDL.c
>--- a/src/SDL.c	Tue Jun 18 18:22:18 2019 +0200
>+++ b/src/SDL.c	Tue Jun 18 12:48:37 2019 -0400
>@@ -43,7 +43,8 @@
> extern int SDL_HelperWindowCreate(void);
> extern int SDL_HelperWindowDestroy(void);
> #endif
>-
>+extern void SDL_envfree(void);
>+extern void SDL_TLSCleanup();
> 
> /* The initialized subsystems */
> #ifdef SDL_MAIN_NEEDED
>@@ -388,6 +389,9 @@
>     SDL_ClearHints();
>     SDL_AssertionsQuit();
>     SDL_LogResetPriorities();
>+    /* Clear the error message */
>+    SDL_TLSCleanup();
>+    SDL_envfree();
> 
>     /* Now that every subsystem has been quit, we reset the subsystem refcount
>      * and the list of initialized subsystems.
>diff -r f92b7ee0dec3 -r ba92e33951e2 src/stdlib/SDL_getenv.c
>--- a/src/stdlib/SDL_getenv.c	Tue Jun 18 18:22:18 2019 +0200
>+++ b/src/stdlib/SDL_getenv.c	Tue Jun 18 12:48:37 2019 -0400
>@@ -37,8 +37,20 @@
> 
> #if defined(__WIN32__) && (!defined(HAVE_SETENV) || !defined(HAVE_GETENV))
> /* Note this isn't thread-safe! */
>-static char *SDL_envmem = NULL; /* Ugh, memory leak */
>+static char *SDL_envmem = NULL;
> static size_t SDL_envmemlen = 0;
>+void
>+SDL_envfree(void)
>+{
>+    SDL_free(SDL_envmem);
>+    SDL_envmem = NULL;
>+    SDL_envmemlen = 0;
>+}
>+#else
>+void
>+SDL_envfree(void)
>+{
>+}
> #endif
> 
> /* Put a variable into the environment */
>@@ -308,6 +320,7 @@
>     } else {
>         printf("failed\n");
>     }
>+    SDL_envfree();
>     return (0);
> }
> #endif /* TEST_MAIN */
>diff -r f92b7ee0dec3 -r ba92e33951e2 src/thread/SDL_thread.c
>--- a/src/thread/SDL_thread.c	Tue Jun 18 18:22:18 2019 +0200
>+++ b/src/thread/SDL_thread.c	Tue Jun 18 12:48:37 2019 -0400
>@@ -83,7 +83,7 @@
>     return 0;
> }
> 
>-static void
>+void
> SDL_TLSCleanup()
> {
>     SDL_TLSData *storage;

Actions: View

Attachments on bug 4673: 3830

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.