Changeset 84160 in vbox for trunk/src/VBox/Additions

Timestamp:

May 6, 2020 11:03:25 AM (5 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: More size_t/uint32_t build fixing, plus some additional integer overflow check paranoia. [build fix] bugref:9320

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (2 diffs)

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

@@ -1055 +1055 @@
         pStartupInfo->psz##a_Str = RTStrAlloc(a_cb); \
         AssertPtrBreak(pStartupInfo->psz##a_Str); \
+        AssertBreak((uint32_t)a_cb == a_cb); \
         pStartupInfo->cb##a_Str  = (uint32_t)a_cb; \
     }
@@ -1146 +1147 @@
         pStartupInfoDup->psz##a_Str = (char *)RTStrDup(pStartupInfo->psz##a_Str); \
         AssertPtrBreak(pStartupInfoDup->psz##a_Str); \
-        pStartupInfoDup->cb##a_Str  = strlen(pStartupInfoDup->psz##a_Str) + 1 /* Include terminator */; \
+        size_t cbStr = strlen(pStartupInfoDup->psz##a_Str) + 1 /* Include terminator */; \
+        AssertBreak((uint32_t)cbStr == cbStr); \
+        pStartupInfoDup->cb##a_Str  = (uint32_t)cbStr; \
     }
             DUP_STR(User);