libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-03 15:54:39 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Fix these two memory errors that popped up with ASAN -

Browse Source 
* Argument base for qsort cannot be NULL
* When system_count is 0 or less, early return out of explore_load_icons
This commit is contained in:
libretroadmin 2022-07-15 19:16:21 +02:00
parent c570e657c1
commit b56b447f08
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
menu/menu_explore.c
View File

@ -379,12 +379,14 @@ static void explore_load_icons(explore_state_t *state)
if (!state)
return;
system_count = RBUF_LEN(state->by[EXPLORE_BY_SYSTEM]);
if ((system_count = RBUF_LEN(state->by[EXPLORE_BY_SYSTEM])) <= 0)
return;
/* unload any icons that could exist from a previous call to this */
explore_unload_icons(state);
/* RBUF_RESIZE leaves memory uninitialised, have to zero it 'manually' */
/* RBUF_RESIZE leaves memory uninitialised,
have to zero it 'manually' */
RBUF_RESIZE(state->icons, system_count);
memset(state->icons, 0, RBUF_SIZEOF(state->icons));
@ -757,7 +759,9 @@ explore_state_t *menu_explore_build_list(const char *directory_playlist,
RHMAP_FREE(cat_maps[i]);
}
qsort(explore->entries,
/* NULL is not a valid value as a first argument for qsort */
if (explore->entries)
qsort(explore->entries,
RBUF_LEN(explore->entries),
sizeof(*explore->entries), explore_qsort_func_entries);
return explore;