Changeset 85262 in vbox

Timestamp:

Jul 12, 2020 12:11:47 AM (4 years ago)

Author:

vboxsync

Message:

Main/VirtualBoxImpl.cpp: Signed/unsigned conversion issues. Left a couple of TODOs behind. bugref:9790

File:

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

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

@@ -1191 +1191 @@
     uRevision |= 1;
 
-    *aAPIRevision = uRevision;
+    *aAPIRevision = (LONG64)uRevision;
 
     return S_OK;
@@ -1914 +1914 @@
         return rc;
 
-    Utf8Str strCreateFlags(aFlags);
+    /** @todo r=bird: Would be goot to rewrite this parsing using offset into
+     *        aFlags and drop all the C pointers, strchr, misguided RTStrStr and
+     *        tedious copying of substrings. */
+    Utf8Str strCreateFlags(aFlags); /** @todo r=bird: WTF is the point of this copy? */
     Guid id;
     bool fForceOverwrite = false;
@@ -1924 +1927 @@
         {
             Utf8Str strFlag;
-            const char *pcszComma = RTStrStr(pcszNext, ",");
+            const char *pcszComma = strchr(pcszNext, ','); /*clueless version: RTStrStr(pcszNext, ","); */
             if (!pcszComma)
                 strFlag = pcszNext;
             else
-                strFlag = Utf8Str(pcszNext, pcszComma - pcszNext);
-
-            const char *pcszEqual = RTStrStr(strFlag.c_str(), "=");
+                strFlag.assign(pcszNext, (size_t)(pcszComma - pcszNext));
+
+            const char *pcszEqual = strchr(strFlag.c_str(), '='); /* more cluelessness: RTStrStr(strFlag.c_str(), "="); */
             /* skip over everything which doesn't contain '=' */
             if (pcszEqual && pcszEqual != strFlag.c_str())
             {
-                Utf8Str strKey(strFlag.c_str(), pcszEqual - strFlag.c_str());
+                Utf8Str strKey(strFlag.c_str(), (size_t)(pcszEqual - strFlag.c_str()));
                 Utf8Str strValue(strFlag.c_str() + (pcszEqual - strFlag.c_str() + 1));
 
@@ -1946 +1949 @@
 
             if (!pcszComma)
-                pcszNext += strFlag.length();
+                pcszNext += strFlag.length();  /* you can just 'break' out here... */
             else
                 pcszNext += strFlag.length() + 1;
         }
     }
+
     /* Create UUID if none was specified. */
     if (id.isZero())