libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(config_file) Prevent hash map corruption when calling config_unset()

Browse Source 
- This is a workaround for the broken 'RHMAP_DEL_STR()' implementation in rhmap.h
- This commit should be reverted when rhmap.h is fixed
This commit is contained in:
jdgleaver 2022-03-21 12:06:49 +00:00 committed by Autechre
parent 05b7ac47c3
commit 28247ba65d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1242,8 +1242,6 @@ void config_unset(config_file_t *conf, const char *key)
if (!entry)
return;
(void)RHMAP_DEL_STR(conf->entries_map, entry->key);
if (entry->key)
free(entry->key);
@ -1253,6 +1251,16 @@ void config_unset(config_file_t *conf, const char *key)
entry->key = NULL;
entry->value = NULL;
conf->modified = true;
/* TODO/FIXME: We want to call RHMAP_DEL_STR()
* here to remove the current entry from the
* internal hash map - but RHMAP_DEL_STR() does
* not work correctly and causes hash map corruption.
* We therefore work around this by leaving the
* entry in the hash map, but setting its value
* to NULL... */
entry = NULL;
RHMAP_SET_STR(conf->entries_map, key, entry);
}
void config_set_path(config_file_t *conf, const char *entry, const char *val)
@ -1460,7 +1468,7 @@ void config_file_dump(config_file_t *conf, FILE *file, bool sort)
bool config_entry_exists(config_file_t *conf, const char *entry)
{
return (bool)RHMAP_HAS_STR(conf->entries_map, entry);
return !!RHMAP_GET_STR(conf->entries_map, entry);
}
bool config_get_entry_list_head(config_file_t *conf,