Changeset 100040 in vbox

Timestamp:

Jun 1, 2023 6:23:30 PM (18 months ago)

Author:

vboxsync

Message:

Runtime/RTFdt: Add methods to add stringlist properties, bugref:10401 [build fix]

File:

• trunk/src/VBox/Runtime/common/misc/fdt.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/misc/fdt.cpp

@@ -1611 +1611 @@
     uint32_t cbStrings = 0;
     for (uint32_t i = 0; i < cStrings; i++)
-        cbStrings += strlen(va_arg(vaCopy, const char *)) + 1; /* Include terminator. */
+        cbStrings += (uint32_t)strlen(va_arg(vaCopy, const char *)) + 1; /* Include terminator. */
 
     uint32_t cbProp = RT_ALIGN_32(cbStrings + 3 * sizeof(uint32_t), sizeof(uint32_t)); /* Account for property token and the property data. */
@@ -1626 +1626 @@
     char *pb = (char *)pu32;
     for (uint32_t i = 0; i < cStrings; i++)
-        pb = stpcpy(pb, va_arg(va, const char *)) + 1;
+    {
+        const char *psz = va_arg(va, const char *);
+        /* MSVC doesn't know about stpcpy(), so we have to query the string length again... */
+        uint32_t cbStr = (uint32_t)strlen(psz);
+        strcpy(pb, psz);
+        pb += cbStr + 1;
+    }
 
     pThis->cbStruct += cbProp;