From 0007d66bf8238187376887f209d2a3c1d2c49160 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 11 Sep 2017 02:22:46 +0200
Subject: [PATCH] Fix memory leaks

---
 Makefile.common         | 2 +-
 menu/menu_displaylist.c | 3 ++-
 tasks/task_save.c       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 7b0938a4c0..f048511ca4 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -3,7 +3,7 @@ DEPS_DIR          := $(ROOT_DIR)/deps
 LIBRETRO_COMM_DIR := $(ROOT_DIR)/libretro-common
 WANT_WGL           = 0
 
-#CFLAGS += -fstack-usage
+CFLAGS += -fstack-usage
 
 ifeq ($(HAVE_GL_CONTEXT),)
    HAVE_GL_CONTEXT=0
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index ea207fa964..98db4e88d4 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1816,9 +1816,9 @@ static int create_string_list_rdb_entry_int(
 
    if (output_label)
       free(output_label);
-   str_list = NULL;
 
    string_list_free(str_list);
+   str_list = NULL;
    free(tmp);
    free(str);
    return 0;
@@ -1826,6 +1826,7 @@ static int create_string_list_rdb_entry_int(
 error:
    if (str_list)
       string_list_free(str_list);
+   str_list = NULL;
    free(tmp);
    free(str);
    return -1;
diff --git a/tasks/task_save.c b/tasks/task_save.c
index 815cbf741f..440f49c995 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -774,8 +774,8 @@ static void task_load_handler(retro_task_t *task)
                msg_hash_to_str(MSG_AUTOLOADING_SAVESTATE_FROM),
                state->path,
                msg_hash_to_str(MSG_FAILED));
-         free(msg);
          task_set_error(task, strdup(msg));
+         free(msg);
       }
       else
          task_set_error(task, strdup(msg_hash_to_str(MSG_FAILED_TO_LOAD_STATE)));