pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix invalid read from poor setlocale usage.

Browse source
This commit is contained in:
Alex Baines 2016-10-03 15:31:11 +01:00
parent 97db1659b4
commit faa1225d54
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/video/x11/SDL_x11video.c
View file

@ -399,6 +399,10 @@ X11_VideoInit(_THIS)
const char *env_xmods = SDL_getenv("XMODIFIERS"); const char *env_xmods = SDL_getenv("XMODIFIERS");
SDL_bool has_dbus_ime_support = SDL_FALSE; SDL_bool has_dbus_ime_support = SDL_FALSE;
if (prev_locale) {
prev_locale = SDL_strdup(prev_locale);
}
if (prev_xmods) { if (prev_xmods) {
prev_xmods = SDL_strdup(prev_xmods); prev_xmods = SDL_strdup(prev_xmods);
} }
@ -431,6 +435,10 @@ X11_VideoInit(_THIS)
setlocale(LC_ALL, prev_locale); setlocale(LC_ALL, prev_locale);
X11_XSetLocaleModifiers(prev_xmods); X11_XSetLocaleModifiers(prev_xmods);
if (prev_locale) {
SDL_free(prev_locale);
}
if (prev_xmods) { if (prev_xmods) {
SDL_free(prev_xmods); SDL_free(prev_xmods);
} }