From a532ef3ceaffa92fe6e0c7dee2d13c5b5ff00dab Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 12 Sep 2017 04:47:37 +0200
Subject: [PATCH] (XMB) Prevent memory leak

---
 Makefile.common    |  4 +++-
 menu/drivers/xmb.c | 53 +++++++++++++++++++++++-----------------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 5fd8c21386..181e7c0356 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -3,7 +3,9 @@ DEPS_DIR          := $(ROOT_DIR)/deps
 LIBRETRO_COMM_DIR := $(ROOT_DIR)/libretro-common
 WANT_WGL           = 0
 
-#CFLAGS += -fstack-usage
+ifeq ($(HAVE_STACK_USAGE), 1)
+CFLAGS += -fstack-usage
+endif
 
 ifeq ($(HAVE_GL_CONTEXT),)
    HAVE_GL_CONTEXT=0
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 42549e3d0f..f97609ddf5 100755
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -3811,38 +3811,39 @@ static void xmb_context_reset_background(const char *iconpath)
 
 static void xmb_context_reset(void *data, bool is_threaded)
 {
-   char *iconpath                  = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-   xmb_handle_t *xmb               = (xmb_handle_t*)data;
-   if (!xmb)
-      return;
+   xmb_handle_t *xmb = (xmb_handle_t*)data;
 
-   iconpath[0] = '\0';
+   if (xmb)
+   {
+      char *iconpath = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+      iconpath[0]    = '\0';
 
-   fill_pathname_application_special(xmb->background_file_path,
-         sizeof(xmb->background_file_path),
-         APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_BG);
+      fill_pathname_application_special(xmb->background_file_path,
+            sizeof(xmb->background_file_path),
+            APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_BG);
 
-   fill_pathname_application_special(iconpath,
-         PATH_MAX_LENGTH * sizeof(char),
-         APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_ICONS);
+      fill_pathname_application_special(iconpath,
+            PATH_MAX_LENGTH * sizeof(char),
+            APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_ICONS);
 
-   xmb_layout(xmb);
-   xmb->font = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT,
-         xmb->font_size,
-         is_threaded);
-   xmb->font2 = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT,
-         xmb->font2_size,
-         is_threaded);
-   xmb_context_reset_textures(xmb, iconpath);
-   xmb_context_reset_background(iconpath);
-   xmb_context_reset_horizontal_list(xmb);
+      xmb_layout(xmb);
+      xmb->font = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT,
+            xmb->font_size,
+            is_threaded);
+      xmb->font2 = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT,
+            xmb->font2_size,
+            is_threaded);
+      xmb_context_reset_textures(xmb, iconpath);
+      xmb_context_reset_background(iconpath);
+      xmb_context_reset_horizontal_list(xmb);
 
-   if (!string_is_equal(xmb_thumbnails_ident(),
-            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF)))
-      xmb_update_thumbnail_image(xmb);
-   xmb_update_savestate_thumbnail_image(xmb);
+      if (!string_is_equal(xmb_thumbnails_ident(),
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF)))
+         xmb_update_thumbnail_image(xmb);
+      xmb_update_savestate_thumbnail_image(xmb);
 
-   free(iconpath);
+      free(iconpath);
+   }
 }
 
 static void xmb_navigation_clear(void *data, bool pending_push)