ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-23 07:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only save ibus_addr_file after we've successfully read an address from it.

Browse source 
Fixes https://github.com/libsdl-org/SDL/issues/3359

(cherry picked from commit bc3d9e99f381072820d29e75e6cc28fe40572c42)
This commit is contained in:
Sam Lantinga 2023-11-05 22:12:37 -08:00
parent 93e51dd33e
commit 64a7e75dd3
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/linux/SDL_ibus.c
View file

@ -574,15 +574,17 @@ SDL_bool SDL_IBus_Init(void)
return SDL_FALSE; return SDL_FALSE;
} }
/* !!! FIXME: if ibus_addr_file != NULL, this will overwrite it and leak (twice!) */
ibus_addr_file = SDL_strdup(addr_file);
addr = IBus_ReadAddressFromFile(addr_file); addr = IBus_ReadAddressFromFile(addr_file);
if (addr == NULL) { if (addr == NULL) {
SDL_free(addr_file); SDL_free(addr_file);
return SDL_FALSE; return SDL_FALSE;
} }
if (ibus_addr_file) {
SDL_free(ibus_addr_file);
}
ibus_addr_file = SDL_strdup(addr_file);
if (inotify_fd < 0) { if (inotify_fd < 0) {
inotify_fd = inotify_init(); inotify_fd = inotify_init();
fcntl(inotify_fd, F_SETFL, O_NONBLOCK); fcntl(inotify_fd, F_SETFL, O_NONBLOCK);