Changeset 61541 in vbox for trunk/src/VBox

Timestamp:

Jun 7, 2016 1:58:26 PM (9 years ago)

Author:

vboxsync

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

107878

Message:

bugref:8344. Better processing of source and destination filename. Check RAW type and CD, DVD type

File:

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

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

@@ -3005 +3005 @@
                     destMediumPath = sourceMediumPath.stripFilename().append('/').append(destMediumFileName);
                 }
-
-                /* set the target extension like on the source. Permission to convert is prohibited */
-                Utf8Str suffix = i_getFormat();
-                suffix.toLower();
-                destMediumPath.stripSuffix().append('.').append(suffix);
+                else
+                {
+                    /* set the target extension like on the source. Permission to convert is prohibited */
+                    Utf8Str suffix = i_getFormat();
+
+                    if (suffix.compare("RAW", Utf8Str::CaseInsensitive) == 0)
+                    {
+                        if(i_getDeviceType() == DeviceType_DVD)
+                        {
+                            suffix = "iso";
+                        }
+                        else
+                        {
+                            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;
+                        }
+                    }
+
+                    suffix.toLower();
+                    destMediumPath.stripSuffix().append('.').append(suffix);
+                }
             }