From a8222087f8dbf4dd7e27d989f634e8e153222b3f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 10 Feb 2015 18:47:59 +0100
Subject: [PATCH] (file_list.c) Improve stability some more

---
 libretro-sdk/file/file_list.c | 39 ++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/libretro-sdk/file/file_list.c b/libretro-sdk/file/file_list.c
index 6642daa91e..060520c8bd 100644
--- a/libretro-sdk/file/file_list.c
+++ b/libretro-sdk/file/file_list.c
@@ -125,14 +125,20 @@ void file_list_copy(file_list_t *list, file_list_t *list_old)
 
    for (i = 0; i < list->size; i++)
    {
-      list_old->list[i].path = strdup(list->list[i].path);
-      list_old->list[i].label = strdup(list->list[i].label);
-      if (list->list[i].alt)
-         list_old->list[i].alt = strdup(list->list[i].alt);
-      list_old->list[i].type = list->list[i].type;
+      list_old->list[i].path          = NULL;
+      list_old->list[i].label         = NULL;
+      list_old->list[i].alt           = NULL;
+      list_old->list[i].type          = list->list[i].type;
       list_old->list[i].directory_ptr = list->list[i].directory_ptr;
-      list_old->list[i].userdata = list->list[i].userdata;
-      list_old->list[i].actiondata = list->list[i].actiondata;
+      list_old->list[i].userdata      = list->list[i].userdata;
+      list_old->list[i].actiondata    = list->list[i].actiondata;
+
+      if (list->list[i].path)
+         list_old->list[i].path       = strdup(list->list[i].path);
+      if (list->list[i].label)
+         list_old->list[i].label      = strdup(list->list[i].label);
+      if (list->list[i].alt)
+         list_old->list[i].alt        = strdup(list->list[i].alt);
    }
 }
 
@@ -140,22 +146,31 @@ void file_list_set_label_at_offset(file_list_t *list, size_t idx,
       const char *label)
 {
    free(list->list[idx].label);
-   list->list[idx].label = strdup(label);
+   list->list[idx].alt      = NULL;
+
+   if (label)
+      list->list[idx].label = strdup(label);
 }
 
 void file_list_get_label_at_offset(const file_list_t *list, size_t idx,
       const char **label)
 {
-   if (label)
-      *label = list->list[idx].label ?
-         list->list[idx].label : list->list[idx].path;
+   if (!label)
+      return;
+
+   *label = list->list[idx].path;
+   if (list->list[idx].label)
+      *label = list->list[idx].label;
 }
 
 void file_list_set_alt_at_offset(file_list_t *list, size_t idx,
       const char *alt)
 {
    free(list->list[idx].alt);
-   list->list[idx].alt = strdup(alt);
+   list->list[idx].alt      = NULL;
+
+   if (alt)
+      list->list[idx].alt   = strdup(alt);
 }
 
 void file_list_get_alt_at_offset(const file_list_t *list, size_t idx,