Changeset 79954 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 24, 2019 11:53:32 AM (6 years ago)

Author:

vboxsync

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

132379

Message:

bugref:8344. Fixed a bug with an uppercase letter suffix in the image name (like ".VMDK").

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (1 diff)

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

@@ -2992 +2992 @@
                     destPath = sourcePath.stripFilename().append(RTPATH_SLASH).append(destFName);
                 }
-                suffix = i_getFormat();
-                if (suffix.compare("RAW", Utf8Str::CaseInsensitive) == 0)
+
+                suffix = RTPathSuffix(sourceFName.c_str());
+
+                /* Suffix is empty and one is deduced from the medium format */
+                if (suffix.isEmpty())
                 {
-                    DeviceType_T devType = i_getDeviceType();
-                    switch (devType)
+                    suffix = i_getFormat();
+                    if (suffix.compare("RAW", Utf8Str::CaseInsensitive) == 0)
                     {
-                        case DeviceType_DVD:
-                            suffix = "iso";
-                            break;
-                        case DeviceType_Floppy:
-                            suffix = "img";
-                            break;
-                        default:
-                            rc = setError(VERR_NOT_A_FILE,
-                                   tr("Medium '%s' has RAW type. \"Move\" operation isn't supported for this type."),
-                                   i_getLocationFull().c_str());
-                            throw rc;
+                        DeviceType_T devType = i_getDeviceType();
+                        switch (devType)
+                        {
+                            case DeviceType_DVD:
+                                suffix = "iso";
+                                break;
+                            case DeviceType_Floppy:
+                                suffix = "img";
+                                break;
+                            default:
+                                rc = setError(VERR_NOT_A_FILE,
+                                       tr("Medium '%s' has RAW type. \"Move\" operation isn't supported for this type."),
+                                       i_getLocationFull().c_str());
+                                throw rc;
+                        }
                     }
+                    else if (suffix.compare("Parallels", Utf8Str::CaseInsensitive) == 0)
+                    {
+                        suffix = "hdd";
+                    }
+
+                    /* Set the target extension like on the source. Any conversions are prohibited */
+                    suffix.toLower();
+                    destPath.stripSuffix().append('.').append(suffix);
                 }
-                else if (suffix.compare("Parallels", Utf8Str::CaseInsensitive) == 0)
-                {
-                    suffix = "hdd";
-                }
-
-                /* Set the target extension like on the source. Any conversions are prohibited */
-                suffix.toLower();
-                destPath.stripSuffix().append('.').append(suffix);
+                else
+                    destPath.stripSuffix().append(suffix);
             }