Changeset 95857 in vbox for trunk/src/VBox

Timestamp:

Jul 26, 2022 11:54:38 PM (2 years ago)

Author:

vboxsync

Message:

VBoxService/Utils: Replaced sscanf with RTStrToUInt32Ex. bugref:10261

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp

@@ -167 +167 @@
  * @returns Success indicator.
  */
-static bool vgsvcUtilGetFileVersionOwn(LPSTR pVerData, PDWORD pdwMajor, PDWORD pdwMinor, PDWORD pdwBuildNumber,
-                                       PDWORD pdwRevisionNumber)
+static bool vgsvcUtilGetFileVersionOwn(LPSTR pVerData, uint32_t *puMajor, uint32_t *puMinor,
+                                       uint32_t *puBuildNumber, uint32_t *puRevisionNumber)
 {
     UINT    cchStrValue = 0;
@@ -175 +175 @@
         return false;
 
-    /** @todo r=bird: get rid of this. Avoid sscanf like the plague! */
-    if (sscanf(pStrValue, "%ld.%ld.%ld.%ld", pdwMajor, pdwMinor, pdwBuildNumber, pdwRevisionNumber) != 4)
-        return false;
+    char *pszNext = pStrValue;
+    int rc = RTStrToUInt32Ex(pszNext, &pszNext, 0, puMajor);
+    AssertReturn(rc == VWRN_TRAILING_CHARS, false);
+    AssertReturn(*pszNext == '.', false);
+
+    rc = RTStrToUInt32Ex(pszNext + 1, &pszNext, 0, puMinor);
+    AssertReturn(rc == VWRN_TRAILING_CHARS, false);
+    AssertReturn(*pszNext == '.', false);
+
+    rc = RTStrToUInt32Ex(pszNext + 1, &pszNext, 0, puBuildNumber);
+    AssertReturn(rc == VWRN_TRAILING_CHARS, false);
+    AssertReturn(*pszNext == '.', false);
+
+    rc = RTStrToUInt32Ex(pszNext + 1, &pszNext, 0, puRevisionNumber);
+    AssertReturn(rc == VINF_SUCCESS || rc == VWRN_TRAILING_CHARS /*??*/, false);
 
     return true;
@@ -188 +200 @@
  * @returns VBox status code.
  * @param   pszFilename         ASCII & ANSI & UTF-8 compliant name.
- * @param   pdwMajor            Where to return the major version number.
- * @param   pdwMinor            Where to return the minor version number.
- * @param   pdwBuildNumber      Where to return the build number.
- * @param   pdwRevisionNumber   Where to return the revision number.
- */
-static int vgsvcUtilGetFileVersion(const char *pszFilename, PDWORD pdwMajor, PDWORD pdwMinor, PDWORD pdwBuildNumber,
-                                   PDWORD pdwRevisionNumber)
+ * @param   puMajor             Where to return the major version number.
+ * @param   puMinor             Where to return the minor version number.
+ * @param   puBuildNumber       Where to return the build number.
+ * @param   puRevisionNumber    Where to return the revision number.
+ */
+static int vgsvcUtilGetFileVersion(const char *pszFilename, uint32_t *puMajor, uint32_t *puMinor, uint32_t *puBuildNumber,
+                                   uint32_t *puRevisionNumber)
 {
     int rc;
 
-    *pdwMajor = *pdwMinor = *pdwBuildNumber = *pdwRevisionNumber = 0;
+    *puMajor = *puMinor = *puBuildNumber = *puRevisionNumber = 0;
 
     /*
@@ -217 +229 @@
                  * it goes beyond the range of an uint16_t / WORD.
                  */
-                if (vgsvcUtilGetFileVersionOwn(pVerData, pdwMajor, pdwMinor, pdwBuildNumber, pdwRevisionNumber))
+                if (vgsvcUtilGetFileVersionOwn(pVerData, puMajor, puMinor, puBuildNumber, puRevisionNumber))
                     rc = VINF_SUCCESS;
                 else
@@ -226 +238 @@
                     if (VerQueryValue(pVerData, "\\", (LPVOID *)&pFileInfo, &cbFileInfoIgnored))
                     {
-                        *pdwMajor          = HIWORD(pFileInfo->dwFileVersionMS);
-                        *pdwMinor          = LOWORD(pFileInfo->dwFileVersionMS);
-                        *pdwBuildNumber    = HIWORD(pFileInfo->dwFileVersionLS);
-                        *pdwRevisionNumber = LOWORD(pFileInfo->dwFileVersionLS);
+                        *puMajor          = HIWORD(pFileInfo->dwFileVersionMS);
+                        *puMinor          = LOWORD(pFileInfo->dwFileVersionMS);
+                        *puBuildNumber    = HIWORD(pFileInfo->dwFileVersionLS);
+                        *puRevisionNumber = LOWORD(pFileInfo->dwFileVersionLS);
                         rc = VINF_SUCCESS;
                     }
@@ -291 +303 @@
     if (RT_SUCCESS(rc))
     {
-        DWORD dwMajor, dwMinor, dwBuild, dwRev;
-        rc = vgsvcUtilGetFileVersion(szFullPath, &dwMajor, &dwMinor, &dwBuild, &dwRev);
+        uint32_t uMajor, uMinor, uBuild, uRev;
+        rc = vgsvcUtilGetFileVersion(szFullPath, &uMajor, &uMinor, &uBuild, &uRev);
         if (RT_SUCCESS(rc))
-            RTStrPrintf(pszVersion, cbVersion, "%u.%u.%ur%u", dwMajor, dwMinor, dwBuild, dwRev);
+            RTStrPrintf(pszVersion, cbVersion, "%u.%u.%ur%u", uMajor, uMinor, uBuild, uRev);
     }
     return rc;