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

(config_file.C) Fix segfaultthat happened at freeing of tmp->key 

when tmp->key is NULL
This commit is contained in:
twinaphex 2016-02-28 18:44:07 +01:00
parent f13b630d57
commit cec6701c0d
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libretro-common/file/config_file.c
View File

@ -524,7 +524,7 @@ config_file_t *config_file_new(const char *path)
void config_file_free(config_file_t *conf)
{
struct config_include_list *inc_tmp = NULL;
struct config_entry_list *tmp = NULL;
struct config_entry_list *tmp = NULL;
if (!conf)
return;
@ -532,11 +532,19 @@ void config_file_free(config_file_t *conf)
while (tmp)
{
struct config_entry_list *hold = NULL;
free(tmp->key);
free(tmp->value);
hold = tmp;
tmp = tmp->next;
free(hold);
if (tmp->key)
free(tmp->key);
if (tmp->value)
free(tmp->value);
tmp->value = NULL;
tmp->key = NULL;
hold = tmp;
tmp = tmp->next;
if (hold)
free(hold);
}
inc_tmp = (struct config_include_list*)conf->includes;
@ -549,7 +557,8 @@ void config_file_free(config_file_t *conf)
free(hold);
}
free(conf->path);
if (conf->path)
free(conf->path);
free(conf);
}