Changeset 103343 in vbox

Timestamp:

Feb 14, 2024 1:55:23 AM (10 months ago)

Author:

vboxsync

Message:

IPRT/fdt.cpp: If you do strlen already, use memcpy instead of strcpy. cbStr always includes the terminator. pb would imply uint8_t pointer, not char pointer.

File:

• trunk/src/VBox/Runtime/common/misc/fdt.cpp (modified) (1 diff)

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

@@ -1708 +1708 @@
     *pu32++ = RT_H2BE_U32(offStr);
 
-    char *pb = (char *)pu32;
+    char *pchDst = (char *)pu32;
     for (uint32_t i = 0; i < cStrings; i++)
     {
-        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;
+        const char * const pszSrc = va_arg(va, const char *);
+        size_t const cbStr = strlen(pszSrc) + 1;
+        Assert((size_t)(pchDst - (char *)pu32) >= cbStr);
+        memcpy(pchDst, pszSrc, cbStr);
+        pchDst += cbStr;
     }