Changeset 85282 in vbox

Timestamp:

Jul 12, 2020 2:53:50 PM (4 years ago)

Author:

vboxsync

Message:

Main/ApplianceImpl.cpp: Signed/unsigned conversion issues in i_searchUniqueImageFilePath. Renamed it to i_ensureUniqueImageFilePath as it's not really searching anything. bugref:9790

File:

• trunk/src/VBox/Main/src-server/ApplianceImpl.cpp (modified) (3 diffs)

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

@@ -982 +982 @@
 }
 
-HRESULT Appliance::i_searchUniqueImageFilePath(const Utf8Str &aMachineFolder, DeviceType_T aDeviceType, Utf8Str &aName) const
+HRESULT Appliance::i_ensureUniqueImageFilePath(const Utf8Str &aMachineFolder, DeviceType_T aDeviceType, Utf8Str &aName) const
 {
     /*
@@ -988 +988 @@
      */
     Utf8Str strAbsName;
-    ssize_t offDashNum = -1;
-    ssize_t cchDashNum = 0;
+    size_t  offDashNum = ~(size_t)0;
+    size_t  cchDashNum = 0;
     for (unsigned i = 1;; i++)
     {
@@ -1007 +1007 @@
 
         /* Insert '_%i' before the suffix and try again. */
-        if (offDashNum < 0)
+        if (offDashNum == ~(size_t)0)
         {
             const char *pszSuffix = RTPathSuffix(aName.c_str());
-            offDashNum = pszSuffix ? pszSuffix - aName.c_str() : aName.length();
+            offDashNum = pszSuffix ? (size_t)(pszSuffix - aName.c_str()) : aName.length();
         }
         char   szTmp[32];