[Bugfix] ft_assemble_path extra slashes, Volume unmound double free

Change-Id: Ie2e7702d8e252ce29af0b9dbd2e8d9e892b9ca18

2 files changed, 12 insertions, 12 deletions

diff --git a/firmware/common/rb_namespace.c b/firmware/common/rb_namespace.c
index 85f647c474..5069a8681e 100644
--- a/firmware/common/rb_namespace.c
+++ b/firmware/common/rb_namespace.c
@@ -74,7 +74,7 @@ static void unmount_item(int item)
     if (!state)
         return;
 
-    if (state & NSITEM_CONTENTS)
+    if (item == ROOT_CONTENTS_INDEX && state & NSITEM_CONTENTS)
     {
         fileobj_unmount(root_bindp);
         root_bindp = NULL;
@@ -139,18 +139,19 @@ int root_mount_path(const char *path, unsigned int flags)
         int root_state = NSITEM_MOUNTED | (flags & (NSITEM_HIDDEN|NSITEM_CONTENTS));
         set_root_item_state(ROOT_CONTENTS_INDEX, root_state);
         flags |= state; /* preserve the state of the mounted volume */
-        if (!folder)
-        {
-            folder = "";
-        }
-        else
+
+        if (folder)
         {
+            while (*folder == PATH_SEPCH)
+                folder++;
             /*if a folder has been enumerated don't mark the whole volume */
-            if (folder[0] != '\0' && folder[1] != '\0')
+            if (folder[0] != '\0')
                 flags &= ~NSITEM_CONTENTS;
-
+            else
+                folder = NULL; /*Ensure separator is added by path_append */
         }
-        snprintf(root_realpath_internal(), ROOT_MAX_REALPATH,"%s%s", volname, folder);
+
+        path_append(root_realpath_internal(), volname, folder, ROOT_MAX_REALPATH);
     }
     else if (state) /* error volume already mounted */
         return -EBUSY;
diff --git a/firmware/include/dircache_redirect.h b/firmware/include/dircache_redirect.h
index 36f68b7251..f51ce70690 100644
--- a/firmware/include/dircache_redirect.h
+++ b/firmware/include/dircache_redirect.h
@@ -139,10 +139,8 @@ static inline void fileop_onsync_internal(struct filestr_base *stream)
 
 static inline void volume_onmount_internal(IF_MV_NONVOID(int volume))
 {
-#if (defined(HAVE_MULTIVOLUME) || (defined(HAVE_MULTIBOOT) && !defined(BOOTLOADER)))
-    char path[VOL_MAX_LEN+2];
-#endif
 #if defined(HAVE_MULTIBOOT) && !defined(SIMULATOR) && !defined(BOOTLOADER)
+    char path[VOL_MAX_LEN+2];
     char rtpath[MAX_PATH / 2];
     make_volume_root(volume, path);
 
@@ -185,6 +183,7 @@ standard_redirect:
             root_mount_path(RB_ROOT_CONTENTS_DIR, NSITEM_CONTENTS);
     }
 #elif defined(HAVE_MULTIVOLUME)
+    char path[VOL_MAX_LEN+2];
     make_volume_root(volume, path);
     root_mount_path(path, RB_ROOT_VOL_HIDDEN(volume) ? NSITEM_HIDDEN : 0);
     if (volume == path_strip_volume(RB_ROOT_CONTENTS_DIR, NULL, false))