mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Zero icon list even on menu drivers without icons

Browse Source 
Otherwise there is a chance for a crash on program exit on certain gfx drivers because it tries to free uninitialized texture ids.
This commit is contained in:
Bernhard Schelling 2020-08-07 20:49:06 +09:00 committed by GitHub
parent 4a09907802
commit 398aa25c98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
menu/menu_explore.c
View File

@ -489,7 +489,13 @@ static void explore_load_icons(explore_state_t *state)
return; return;
system_count = RBUF_LEN(state->by[EXPLORE_BY_SYSTEM]); system_count = RBUF_LEN(state->by[EXPLORE_BY_SYSTEM]);
/* 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(state->icons, system_count); RBUF_RESIZE(state->icons, system_count);
memset(state->icons, 0, RBUF_SIZEOF(state->icons));
fill_pathname_application_special(path, sizeof(path), fill_pathname_application_special(path, sizeof(path),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_SYSICONS); APPLICATION_SPECIAL_DIRECTORY_ASSETS_SYSICONS);
@ -502,7 +508,6 @@ static void explore_load_icons(explore_state_t *state)
for (i = 0; i != system_count; i++) for (i = 0; i != system_count; i++)
{ {
struct texture_image ti; struct texture_image ti;
state->icons[i] = 0;
strlcpy(path + pathlen, strlcpy(path + pathlen,
state->by[EXPLORE_BY_SYSTEM][i]->str, sizeof(path) - pathlen); state->by[EXPLORE_BY_SYSTEM][i]->str, sizeof(path) - pathlen);