Changeset 67226 in vbox

Timestamp:

Jun 2, 2017 9:27:26 AM (8 years ago)

Author:

vboxsync

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

115915

Message:

Main/MediumImpl: bugref:8344: enforce an absolute path when changing the medium location

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -3067 +3067 @@
         /* play with locations */
         {
-            /*get source path and filename */
+            /* get source path and filename */
             Utf8Str sourceMediumPath = i_getLocationFull();
             Utf8Str sourceMediumFileName = i_getName();
@@ -3079 +3079 @@
             }
 
-            /*extract destination path and filename */
+            /* extract destination path and filename */
             Utf8Str destMediumPath(aLocation);
             Utf8Str destMediumFileName(destMediumPath);
@@ -3085 +3085 @@
 
             Utf8Str suffix(destMediumFileName);
-            suffix.stripSuffix();//for small trick, see next condition
-
-            if(suffix.equals(destMediumFileName) && !destMediumFileName.isEmpty())
+            suffix.stripSuffix();
+
+            if (suffix.equals(destMediumFileName) && !destMediumFileName.isEmpty())
             {
                 /*
@@ -3103 +3103 @@
                     destMediumPath = destMediumFileName;
                 }
-                /* case when new path looks like "/path/to/new/location"
-                 * In this case just set destMediumFileName to NULL and
-                 * and add '/' in the end of path.destMediumPath
-                 */
                 else
                 {
+                    /* new path looks like "/path/to/new/location" */
                     destMediumFileName.setNull();
                     destMediumPath.append(RTPATH_SLASH);
@@ -3116 +3113 @@
             if (destMediumFileName.isEmpty())
             {
-                /* case when a target name is absent */
+                /* No target name */
                 destMediumPath.append(sourceMediumFileName);
             }
@@ -3123 +3120 @@
                 if (destMediumPath.equals(destMediumFileName))
                 {
-                    /* the passed target path consist of only a filename without directory
+                    /*
+                     * the passed target path consist of only a filename without directory
                      * next move medium within the source directory with the passed new name
                      */
@@ -3132 +3130 @@
                 if (suffix.compare("RAW", Utf8Str::CaseInsensitive) == 0)
                 {
-                    if(i_getDeviceType() == DeviceType_DVD)
-                    {
+                    if (i_getDeviceType() == DeviceType_DVD)
                         suffix = "iso";
-                    }
                     else
                     {
@@ -3151 +3147 @@
             if (i_isMediumFormatFile())
             {
+                /* Path must be absolute */
+                char *pszAbs = RTPathAbsDup(destMediumPath.c_str());
+                int iCmp = destMediumPath.compare(pszAbs, Utf8Str::CaseInsensitive);
+                RTStrFree(pszAbs);
+                if (iCmp)
+                {
+                    rc = setError(VBOX_E_FILE_ERROR,
+                                  tr("The given target path '%s' is not absolute"),
+                                  destMediumPath.c_str());
+                    throw rc;
+                }
                 /* Check path for a new file object */
                 rc = VirtualBox::i_ensureFilePathExists(destMediumPath, true);
@@ -6694 +6701 @@
 Utf8Str Medium::i_getNewLocationForMoving() const
 {
-    if(m->fMoveThisMedium == true)
+    if (m->fMoveThisMedium == true)
         return m->strNewLocationFull;
     else