Changeset 67239 in vbox

Timestamp:

Jun 2, 2017 1:37:59 PM (8 years ago)

Author:

vboxsync

Message:

Main/MediumImpl: bugref:8344: use RTPathStartsWithRoot() to ensure that the medium is fully qualified. Less strict than calling RTPathAbs() but sufficient. Cosmetic changes.

File:

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

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

@@ -3068 +3068 @@
         {
             /* get source path and filename */
-            Utf8Str sourceMediumPath = i_getLocationFull();
-            Utf8Str sourceMediumFileName = i_getName();
+            Utf8Str sourcePath = i_getLocationFull();
+            Utf8Str sourceFName = i_getName();
 
             if (aLocation.isEmpty())
@@ -3080 +3080 @@
 
             /* extract destination path and filename */
-            Utf8Str destMediumPath(aLocation);
-            Utf8Str destMediumFileName(destMediumPath);
-            destMediumFileName.stripPath();
-
-            Utf8Str suffix(destMediumFileName);
+            Utf8Str destPath(aLocation);
+            Utf8Str destFName(destPath);
+            destFName.stripPath();
+
+            Utf8Str suffix(destFName);
             suffix.stripSuffix();
 
-            if (suffix.equals(destMediumFileName) && !destMediumFileName.isEmpty())
+            if (suffix.equals(destFName) && !destFName.isEmpty())
             {
                 /*
-                 * small trick. This case means target path has no filename at the end.
-                 * it will look like "/path/to/new/location" or just "newname"
-                 * there is no backslash in the end
-                 * or there is no filename with extension(suffix) in the end
+                 * The target path has no filename: Either "/path/to/new/location" or
+                 * just "newname" (no trailing backslash or there is no filename with
+                 * extension(suffix)).
                  */
-
-                /* case when new path contains only "newname", no path, no extension */
-                if (destMediumPath.equals(destMediumFileName))
+                if (destPath.equals(destFName))
                 {
-                    Utf8Str localSuffix = RTPathSuffix(sourceMediumFileName.c_str());
-                    destMediumFileName.append(localSuffix);
-                    destMediumPath = destMediumFileName;
+                    /* new path contains only "newname", no path, no extension */
+                    destFName.append(RTPathSuffix(sourceFName.c_str()));
+                    destPath = destFName;
                 }
                 else
                 {
                     /* new path looks like "/path/to/new/location" */
-                    destMediumFileName.setNull();
-                    destMediumPath.append(RTPATH_SLASH);
+                    destFName.setNull();
+                    destPath.append(RTPATH_SLASH);
                 }
             }
 
-            if (destMediumFileName.isEmpty())
+            if (destFName.isEmpty())
             {
                 /* No target name */
-                destMediumPath.append(sourceMediumFileName);
+                destPath.append(sourceFName);
             }
             else
             {
-                if (destMediumPath.equals(destMediumFileName))
+                if (destPath.equals(destFName))
                 {
                     /*
-                     * the passed target path consist of only a filename without directory
-                     * next move medium within the source directory with the passed new name
+                     * The target path contains of only a filename without a directory.
+                     * Move the medium within the source directory to the new name
+                     * (actually rename operation).
+                     * Scratches sourcePath!
                      */
-                    destMediumPath = sourceMediumPath.stripFilename().append(RTPATH_SLASH).append(destMediumFileName);
+                    destPath = sourcePath.stripFilename().append(RTPATH_SLASH).append(destFName);
                 }
                 suffix = i_getFormat();
-
                 if (suffix.compare("RAW", Utf8Str::CaseInsensitive) == 0)
                 {
@@ -3140 +3138 @@
                     }
                 }
-                /* set the target extension like on the source. Any conversions are prohibited */
+                /* Set the target extension like on the source. Any conversions are prohibited */
                 suffix.toLower();
-                destMediumPath.stripSuffix().append('.').append(suffix);
-            }
-
-            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);
-                if (FAILED(rc))
-                    throw rc;
-            }
-            else
+                destPath.stripSuffix().append('.').append(suffix);
+            }
+
+            if (!i_isMediumFormatFile())
             {
                 rc = setError(VERR_NOT_A_FILE,
-                           tr("Medium '%s' isn't a file object. \"Move\" operation isn't supported."),
-                           i_getLocationFull().c_str());
+                              tr("Medium '%s' isn't a file object. \"Move\" operation isn't supported."),
+                              i_getLocationFull().c_str());
                 throw rc;
             }
+            /* Path must be absolute */
+            if (!RTPathStartsWithRoot(destPath.c_str()))
+            {
+                rc = setError(VBOX_E_FILE_ERROR,
+                              tr("The given path '%s' is not fully qualified"),
+                              destPath.c_str());
+                throw rc;
+            }
+            /* Check path for a new file object */
+            rc = VirtualBox::i_ensureFilePathExists(destPath, true);
+            if (FAILED(rc))
+                throw rc;
 
             /* Set needed variables for "moving" procedure. It'll be used later in separate thread task */
-            rc = i_preparationForMoving(destMediumPath);
+            rc = i_preparationForMoving(destPath);
             if (FAILED(rc))
             {
@@ -3209 +3201 @@
                 {
                     rc = setError(VERR_VM_UNEXPECTED_VM_STATE,
-                                  tr("At least VM '%s' to whom this medium '%s' attached has the opened session now. "
-                                     "Stop all needed VM before set a new location."),
+                                  tr("At least the VM '%s' to whom this medium '%s' attached has currently an opened session. Stop all VMs before relocating this medium"),
                                   id.toString().c_str(),
                                   i_getLocationFull().c_str());
@@ -3279 +3270 @@
     else
     {
-        if (pTask != NULL)
+        if (pTask)
             delete pTask;
     }