1 files changed, 5 insertions, 2 deletions

diff --git a/uisimulator/common/filesystem-sim.c b/uisimulator/common/filesystem-sim.c
index 7a3418021e..786f17e644 100644
--- a/uisimulator/common/filesystem-sim.c
+++ b/uisimulator/common/filesystem-sim.c
@@ -307,9 +307,12 @@ int sim_get_os_path(char *buffer, const char *path, size_t bufsize)
         #ifdef HAVE_MULTIVOLUME
             if (level != 1)
                 break; /* Volume spec only valid @ root level */
+            if (p[-1] != PATH_SEPCH)
+                break;
 
             const char *next;
-            volume = path_strip_volume(p, &next, true);
+            volume = path_strip_volume(p-1, &next, true);
+
             if (volume == ROOT_VOLUME)
                 volume = 0; /* FIXME: root no longer implies volume 0 */
 
@@ -831,7 +834,7 @@ int os_volume_path(IF_MV(int volume, ) char *buffer, size_t bufsize)
     char volname[VOL_MAX_LEN + 1];
     get_volume_name(volume, volname);
 
-    if (path_append(tmpbuf, PA_SEP_HARD, volname, sizeof (volname))
+    if (path_append(tmpbuf, PA_SEP_HARD, volname, sizeof (tmpbuf))
             >= sizeof (volname))
         return -1;
 #endif /* HAVE_MULTIVOLUME */