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

Merge pull request #10663 from jdgleaver/overlay-leak-fix 

Fix memory leak when loading overlays
This commit is contained in:
Autechre 2020-05-19 18:05:23 +02:00 committed by GitHub
parent 521f4bfefc 6800fadafe
commit 7eaa771d57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
retroarch.c
View File

@ -13341,20 +13341,18 @@ void input_overlay_free_overlay(struct overlay *overlay)
free(overlay->descs); free(overlay->descs);
overlay->descs = NULL; overlay->descs = NULL;
image_texture_free(&overlay->image); image_texture_free(&overlay->image);
if (overlay_ptr)
free(overlay_ptr);
overlay_ptr = NULL;
} }
static void input_overlay_free_overlays(input_overlay_t *ol) static void input_overlay_free_overlays(input_overlay_t *ol)
{ {
size_t i; size_t i;
if (!ol || !ol->overlays)
return;
for (i = 0; i < ol->size; i++) for (i = 0; i < ol->size; i++)
input_overlay_free_overlay(&ol->overlays[i]); input_overlay_free_overlay(&ol->overlays[i]);
if (ol->overlays)
free(ol->overlays); free(ol->overlays);
ol->overlays = NULL; ol->overlays = NULL;
} }
@ -13722,7 +13720,6 @@ static void input_overlay_free(input_overlay_t *ol)
{ {
if (!ol) if (!ol)
return; return;
overlay_ptr = NULL;
input_overlay_free_overlays(ol); input_overlay_free_overlays(ol);
@ -13785,6 +13782,15 @@ static void input_overlay_loaded(retro_task_t *task,
ol->next_index = (unsigned)((ol->index + 1) % ol->size); ol->next_index = (unsigned)((ol->index + 1) % ol->size);
ol->state = OVERLAY_STATUS_NONE; ol->state = OVERLAY_STATUS_NONE;
ol->alive = true; ol->alive = true;
/* Due to the asynchronous nature of overlay loading
* it is possible for overlay_ptr to be non-NULL here
* > Ensure it is free()'d before assigning new pointer */
if (overlay_ptr)
{
input_overlay_free_overlays(overlay_ptr);
free(overlay_ptr);
}
overlay_ptr = ol; overlay_ptr = ol;
free(data); free(data);
@ -14012,6 +14018,7 @@ static void retroarch_overlay_init(void)
float overlay_opacity = settings->floats.input_overlay_opacity; float overlay_opacity = settings->floats.input_overlay_opacity;
float overlay_scale = settings->floats.input_overlay_scale; float overlay_scale = settings->floats.input_overlay_scale;
bool overlay_hide_in_menu = settings->bools.input_overlay_hide_in_menu; bool overlay_hide_in_menu = settings->bools.input_overlay_hide_in_menu;
bool load_enabled = input_overlay_enable;
#if defined(GEKKO) #if defined(GEKKO)
/* Avoid a crash at startup or even when toggling overlay in rgui */ /* Avoid a crash at startup or even when toggling overlay in rgui */
uint64_t memory_free = frontend_driver_get_free_memory(); uint64_t memory_free = frontend_driver_get_free_memory();
@ -14021,7 +14028,12 @@ static void retroarch_overlay_init(void)
retroarch_overlay_deinit(); retroarch_overlay_deinit();
if (input_overlay_enable) /* Cancel load if 'hide_in_menu' is enabled and
* menu is currently active */
if (overlay_hide_in_menu)
load_enabled = load_enabled && !menu_driver_alive;
if (load_enabled)
task_push_overlay_load_default(input_overlay_loaded, task_push_overlay_load_default(input_overlay_loaded,
path_overlay, path_overlay,
overlay_hide_in_menu, overlay_hide_in_menu,