Changeset 52842 in vbox

Timestamp:

Sep 24, 2014 1:44:42 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96253

Message:

VBoxManageGuestCtrl.cpp: Fixed ctrlCopyCreateSourceRoot().

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -2360 +2360 @@
 
     char *pszNewRoot = RTStrDup(pszSource);
-    AssertPtrReturn(pszNewRoot, VERR_NO_MEMORY);
+    if (!pszNewRoot)
+        return VERR_NO_MEMORY;
 
     size_t lenRoot = strlen(pszNewRoot);
     if (   lenRoot
-        && pszNewRoot[lenRoot - 1] == '/'
-        && pszNewRoot[lenRoot - 1] == '\\'
-        && lenRoot > 1
-        && pszNewRoot[lenRoot - 2] == '/'
-        && pszNewRoot[lenRoot - 2] == '\\')
-    {
-        *ppszSourceRoot = pszNewRoot;
-        if (lenRoot > 1)
-            *ppszSourceRoot[lenRoot - 2] = '\0';
-        *ppszSourceRoot[lenRoot - 1] = '\0';
-    }
-    else
+        && (   pszNewRoot[lenRoot - 1] == '/'
+            || pszNewRoot[lenRoot - 1] == '\\')
+       )
+    {
+        pszNewRoot[lenRoot - 1] = '\0';
+    }
+
+    if (   lenRoot > 1
+        && (   pszNewRoot[lenRoot - 2] == '/'
+            || pszNewRoot[lenRoot - 2] == '\\')
+       )
+    {
+        pszNewRoot[lenRoot - 2] = '\0';
+    }
+
+    if (!lenRoot)
     {
         /* If there's anything (like a file name or a filter),
          * strip it! */
         RTPathStripFilename(pszNewRoot);
-        *ppszSourceRoot = pszNewRoot;
-    }
+    }
+
+    *ppszSourceRoot = pszNewRoot;
 
     return VINF_SUCCESS;