ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: Fix incorrect free in xemu_settings_set_string

This commit is contained in:
Matt Borgerson 2021-06-11 18:55:47 -07:00 committed by mborgerson
parent 179304aca3
commit 374635a1a0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/xemu-settings.c
View File

@ -145,7 +145,9 @@ static void *xemu_settings_get_field(enum xemu_settings_keys key, enum config_ty
int xemu_settings_set_string(enum xemu_settings_keys key, const char *str) int xemu_settings_set_string(enum xemu_settings_keys key, const char *str)
{ {
char **field_str = (char **)xemu_settings_get_field(key, CONFIG_TYPE_STRING); char **field_str = (char **)xemu_settings_get_field(key, CONFIG_TYPE_STRING);
free(*field_str); if (*field_str) {
free(*field_str);
}
*field_str = strdup(str); *field_str = strdup(str);
return 0; return 0;
} }
@ -369,6 +371,7 @@ void xemu_settings_load(void)
g_settings = malloc(sizeof(struct xemu_settings)); g_settings = malloc(sizeof(struct xemu_settings));
assert(g_settings != NULL); assert(g_settings != NULL);
memset(g_settings, 0, sizeof(struct xemu_settings));
xemu_settings_init_default(g_settings); xemu_settings_init_default(g_settings);
// Parse configuration file // Parse configuration file