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

Timestamp:

Jul 12, 2020 3:11:52 PM (5 years ago)

Author:

vboxsync

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

139261

Message:

Main/MediumImpl.cpp: Signed/unsigned conversion issues, a whole bunch which was mixing VBox status codes and COM statues via setErrorVrc in the moveTo() code. Changed i_resize to take an uint64_t size rather than LONG64, and made resize() fail on negative or zero size. bugref:9790

File:

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

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

@@ -26 +26 @@
 
 #include "AutoCaller.h"
+#include "Global.h"
 #include "LoggingNew.h"
 #include "ThreadTask.h"
@@ -1271 +1272 @@
         {
             // Otherwise use the old VirtualBox "make absolute path" logic:
-            rc = m->pVirtualBox->i_calculateFullPath(data.strLocation, strFull);
-            if (FAILED(rc)) return rc;
+            int vrc = m->pVirtualBox->i_calculateFullPath(data.strLocation, strFull);
+            if (RT_FAILURE(vrc))
+                return Global::vboxStatusCodeToCOM(vrc);
         }
     }
@@ -1702 +1704 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aSize = m->size;
+    *aSize = (LONG64)m->size;
 
     return S_OK;
@@ -1947 +1949 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aLogicalSize = m->logicalSize;
+    *aLogicalSize = (LONG64)m->logicalSize;
 
     return S_OK;
@@ -2589 +2591 @@
 
         /* setup task object to carry out the operation asynchronously */
-        pTask = new Medium::CreateBaseTask(this, pProgress, aLogicalSize,
+        pTask = new Medium::CreateBaseTask(this, pProgress, (uint64_t)aLogicalSize,
                                            (MediumVariant_T)mediumVariantFlags);
         rc = pTask->rc();
@@ -2784 +2786 @@
                             ComPtr<IProgress> &aProgress)
 {
-     int rc = S_OK;
-
-     rc =  cloneTo(aTarget, aVariant, NULL, aProgress);
-     return rc;
+     return cloneTo(aTarget, aVariant, NULL, aProgress);
 }
 
@@ -2979 +2978 @@
             if (aLocation.isEmpty())
             {
-                rc = setError(VERR_PATH_ZERO_LENGTH,
-                           tr("Medium '%s' can't be moved. Destination path is empty."),
-                           i_getLocationFull().c_str());
+                rc = setErrorVrc(VERR_PATH_ZERO_LENGTH,
+                                 tr("Medium '%s' can't be moved. Destination path is empty."),
+                                 i_getLocationFull().c_str());
                 throw rc;
             }
@@ -3046 +3045 @@
                                 break;
                             default:
-                                rc = setError(VERR_NOT_A_FILE, /** @todo r=bird: Mixing status codes again. */
-                                       tr("Medium '%s' has RAW type. \"Move\" operation isn't supported for this type."),
-                                       i_getLocationFull().c_str());
+                                rc = setErrorVrc(VERR_NOT_A_FILE, /** @todo r=bird: Mixing status codes again. */
+                                                 tr("Medium '%s' has RAW type. \"Move\" operation isn't supported for this type."),
+                                                 i_getLocationFull().c_str());
                                 throw rc;
                         }
@@ -3076 +3075 @@
             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());
+                rc = setErrorVrc(VERR_NOT_A_FILE,
+                                 tr("Medium '%s' isn't a file object. \"Move\" operation isn't supported."),
+                                 i_getLocationFull().c_str());
                 throw rc;
             }
@@ -3098 +3097 @@
             if (FAILED(rc))
             {
-                rc = setError(VERR_NO_CHANGE,
-                           tr("Medium '%s' is already in the correct location"),
-                           i_getLocationFull().c_str());
+                rc = setErrorVrc(VERR_NO_CHANGE,
+                                 tr("Medium '%s' is already in the correct location"),
+                                 i_getLocationFull().c_str());
                 throw rc;
             }
@@ -3141 +3140 @@
                 if (ses)
                 {
-                    rc = setError(VERR_VM_UNEXPECTED_VM_STATE,
+                    rc = setError(VBOX_E_INVALID_VM_STATE,
                                   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(),
@@ -3299 +3298 @@
                         alock.acquire();
 
-                        rc = setError(VERR_VM_UNEXPECTED_VM_STATE,
+                        rc = setError(VBOX_E_INVALID_VM_STATE,
                                       tr("At least the VM '%s' to whom this medium '%s' attached has currently an opened session. Stop all VMs before set location for this medium"),
                                       id.toString().c_str(),
@@ -3406 +3405 @@
                        ComPtr<IProgress> &aProgress)
 {
+    CheckComArgExpr(aLogicalSize, aLogicalSize > 0);
     HRESULT rc = S_OK;
     ComObjPtr<Progress> pProgress;
@@ -3453 +3453 @@
 
     if (SUCCEEDED(rc))
-        rc = i_resize(aLogicalSize, pMediumLockList, &pProgress, false /* aWait */, true /* aNotify */);
+        rc = i_resize((uint64_t)aLogicalSize, pMediumLockList, &pProgress, false /* aWait */, true /* aNotify */);
 
     if (SUCCEEDED(rc))
@@ -5066 +5066 @@
     /* m->variant is const, no need to lock */
     ULONG mediumVariantFlags = (ULONG)m->variant;
-    mediumVariantFlags &= ~(MediumVariant_Fixed | MediumVariant_VmdkStreamOptimized);
+    mediumVariantFlags &= ~(ULONG)(MediumVariant_Fixed | MediumVariant_VmdkStreamOptimized);
     mediumVariantFlags |= MediumVariant_Diff;
     return (MediumVariant_T)mediumVariantFlags;
@@ -6186 +6186 @@
  */
 
-HRESULT Medium::i_resize(LONG64 aLogicalSize,
+HRESULT Medium::i_resize(uint64_t aLogicalSize,
                          MediumLockList *aMediumLockList,
                          ComObjPtr<Progress> *aProgress,