From 127d98fb687bf29df2680c16efcb2d553e7c5e2c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 29 Sep 2017 22:16:17 +0200
Subject: [PATCH] Rewrite path from nbio struct

---
 tasks/task_audio_mixer.c |  7 ++++++-
 tasks/task_image.c       | 11 ++++++++++-
 tasks/tasks_internal.h   | 16 ++++++++--------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/tasks/task_audio_mixer.c b/tasks/task_audio_mixer.c
index ee5d70f0c1..1c2afea44e 100644
--- a/tasks/task_audio_mixer.c
+++ b/tasks/task_audio_mixer.c
@@ -23,6 +23,7 @@
 #include <file/nbio.h>
 #include <audio/audio_mixer.h>
 #include <compat/strl.h>
+#include <string/stdstring.h>
 #include <retro_miscellaneous.h>
 
 #include "../audio/audio_driver.h"
@@ -52,6 +53,8 @@ static void task_audio_mixer_load_free(retro_task_t *task)
          free(image->buffer);
    }
 
+   if (nbio->path && !string_is_empty(nbio->path))
+      free(nbio->path);
    if (nbio->data)
       free(nbio->data);
    nbio_free(nbio->handle);
@@ -188,7 +191,7 @@ bool task_push_audio_mixer_load(const char *fullpath, retro_task_callback_t cb,
    if (!nbio)
       goto error;
 
-   strlcpy(nbio->path, fullpath, sizeof(nbio->path));
+   nbio->path         = strdup(fullpath);
 
    image              = (struct audio_mixer_handle*)calloc(1, sizeof(*image));   
    if (!image)
@@ -239,6 +242,8 @@ bool task_push_audio_mixer_load(const char *fullpath, retro_task_callback_t cb,
 error:
    if (nbio)
    {
+      if (nbio->path && !string_is_empty(nbio->path))
+         free(nbio->path);
       if (nbio->data)
          free(nbio->data);
       nbio_free(nbio->handle);
diff --git a/tasks/task_image.c b/tasks/task_image.c
index d062b9fe38..301e1270a9 100644
--- a/tasks/task_image.c
+++ b/tasks/task_image.c
@@ -21,6 +21,7 @@
 #include <file/nbio.h>
 #include <formats/image.h>
 #include <compat/strl.h>
+#include <string/stdstring.h>
 #include <retro_miscellaneous.h>
 
 #include "../gfx/video_driver.h"
@@ -157,9 +158,12 @@ static void task_image_cleanup(nbio_handle_t *nbio)
       image->handle                 = NULL;
       image->cb                     = NULL;
    }
+   if (nbio->path && !string_is_empty(nbio->path))
+      free(nbio->path);
    if (nbio->data)
       free(nbio->data);
    nbio_free(nbio->handle);
+   nbio->path        = NULL;
    nbio->data        = NULL;
    nbio->handle      = NULL;
 }
@@ -296,7 +300,7 @@ bool task_push_image_load(const char *fullpath, retro_task_callback_t cb, void *
    if (!nbio)
       goto error;
 
-   strlcpy(nbio->path, fullpath, sizeof(nbio->path));
+   nbio->path         = strdup(fullpath);
 
    if (video_driver_supports_rgba())
       BIT32_SET(nbio->status_flags, NBIO_FLAG_IMAGE_SUPPORTS_RGBA);
@@ -352,7 +356,12 @@ error:
    task_image_load_free(t);
    free(t);
    if (nbio)
+   {
+      if (nbio->path 
+            && !string_is_empty(nbio->path))
+         free(nbio->path);
       free(nbio);
+   }
 
 error_msg:
    RARCH_ERR("[image load] Failed to open '%s': %s.\n",
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
index 390d9d49be..e9174eac43 100644
--- a/tasks/tasks_internal.h
+++ b/tasks/tasks_internal.h
@@ -81,22 +81,22 @@ enum nbio_type
 typedef struct nbio_handle
 {
    enum nbio_type type;
-   void *data;
    bool is_finished;
-   transfer_cb_t  cb;
-   struct nbio_t *handle;
-   unsigned pos_increment;
-   msg_queue_t *msg_queue;
    unsigned status;
+   unsigned pos_increment;
    uint32_t status_flags;
-   char path[4096];
+   void *data;
+   char *path;
+   struct nbio_t *handle;
+   msg_queue_t *msg_queue;
+   transfer_cb_t  cb;
 } nbio_handle_t;
 
 #ifdef HAVE_NETWORKING
 typedef struct
 {
-    char *data;
-    size_t len;
+   char *data;
+   size_t len;
 } http_transfer_data_t;
 
 void *task_push_http_transfer(const char *url, bool mute, const char *type,