Changeset 46337 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

May 31, 2013 9:53:13 AM (12 years ago)

Author:

vboxsync

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

86123

Message:

Main/OVF: added a sanity check for the size of OVF filenames to prevent creating invalid appliances if the VM name is too long

File:

• trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (modified) (4 diffs)

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

@@ -324 +324 @@
             LONG64  llSize = 0;
 
-            if (deviceType == DeviceType_HardDisk
-                 && pMedium)
+            if (   deviceType == DeviceType_HardDisk
+                && pMedium)
             {
                 Bstr bstrLocation;
@@ -348 +348 @@
                 Utf8Str strTargetName = Utf8Str(locInfo.strPath).stripPath().stripExt();
                 strTargetVmdkName = Utf8StrFmt("%s-disk%d.vmdk", strTargetName.c_str(), ++pAppliance->m->cDisks);
+                if (strTargetVmdkName.length() > RTTAR_NAME_MAX)
+                    throw setError(VBOX_E_NOT_SUPPORTED,
+                                tr("Cannot attach disk '%s' -- file name too long"), strTargetVmdkName.c_str());
 
                 // force reading state, or else size will be returned as 0
@@ -357 +360 @@
                 if (FAILED(rc)) throw rc;
             }
-            else if (deviceType == DeviceType_DVD
-                      && pMedium)
+            else if (   deviceType == DeviceType_DVD
+                     && pMedium)
             {
                 Bstr bstrLocation;
@@ -381 +384 @@
                 Utf8Str strTargetName = Utf8Str(locInfo.strPath).stripPath().stripExt();
                 strTargetVmdkName = Utf8StrFmt("%s-disk%d.iso", strTargetName.c_str(), ++pAppliance->m->cDisks);
+                if (strTargetVmdkName.length() > RTTAR_NAME_MAX)
+                    throw setError(VBOX_E_NOT_SUPPORTED,
+                                tr("Cannot attach image '%s' -- file name too long"), strTargetVmdkName.c_str());
 
                 // force reading state, or else size will be returned as 0