commit 1f8c158832ed383cb2ee68c55a662d00745fea71
author Alex Baines <alex@abaines.me.uk> Mon Oct 03 15:31:11 2016 +0100
committer Alex Baines <alex@abaines.me.uk> Mon Oct 03 15:31:11 2016 +0100
tree 791779e42461a4df2a093b98f15d5f692a2ab6a2
parent c424b15929b7e83879ed3ff858ea37acbd1526dc

Fix invalid read from poor setlocale usage.

src/video/x11/SDL_x11video.c

diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c
index 724b5fb..e658ac0 100644
--- a/src/video/x11/SDL_x11video.c
+++ b/src/video/x11/SDL_x11video.c
@@ -399,6 +399,10 @@
         const char *env_xmods = SDL_getenv("XMODIFIERS");
         SDL_bool has_dbus_ime_support = SDL_FALSE;
 
+        if (prev_locale) {
+            prev_locale = SDL_strdup(prev_locale);
+        }
+
         if (prev_xmods) {
             prev_xmods = SDL_strdup(prev_xmods);
         }
@@ -431,6 +435,10 @@
         setlocale(LC_ALL, prev_locale);
         X11_XSetLocaleModifiers(prev_xmods);
 
+        if (prev_locale) {
+            SDL_free(prev_locale);
+        }
+
         if (prev_xmods) {
             SDL_free(prev_xmods);
         }