Changeset 103285 in vbox for trunk/src/VBox/Runtime

Timestamp:

Feb 8, 2024 3:27:12 PM (10 months ago)

Author:

vboxsync

Message:

Re-applied r161549 again (Got rid of a lot of deprecated strcpy / strcat calls; now using the IPRT pendants (found by Parfait)), left out some stuff which wasn't wanted, less bloated version of DrvAudio.cpp. bugref:3409

Location:

trunk/src/VBox/Runtime

Files:

• common/dbg/dbgmod.cpp (modified) (1 diff)
• r3/xml.cpp (modified) (1 diff)
• testcase/tstRTR0CommonDriver.h (modified) (2 diffs)

trunk/src/VBox/Runtime/common/dbg/dbgmod.cpp

@@ -610 +610 @@
             if (pszName)
             {
-                size_t cchName = strlen(pszName);
-                char *pszExtFileBuf = (char *)alloca(cchName + strlen(pszExt) + 1);
-                if (pszExtFileBuf)
-                {
-                    memcpy(pszExtFileBuf, pszName, cchName + 1);
-                    RTPathStripSuffix(pszExtFileBuf);
-                    pszExtFile = strcat(pszExtFileBuf, pszExt);
-                }
+                size_t const cchName       = strlen(pszName);
+                size_t const cchExtFileBuf = cchName + strlen(pszExt) + 1;
+
+                char *pszExtFileBuf = (char *)alloca(cchExtFileBuf);
+                AssertPtrReturn(pszExtFileBuf, VERR_NO_MEMORY);
+
+                memcpy(pszExtFileBuf, pszName, cchName + 1);
+                RTPathStripSuffix(pszExtFileBuf);
+                int rc2 = RTStrCat(pszExtFileBuf, cchExtFileBuf, pszExt);
+                AssertRCReturn(rc2, rc2);
+
+                pszExtFile = pszExtFileBuf;
             }
         }

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -2310 +2310 @@
         if (RT_FAILURE(rc))
             throw EIPRTFailure(rc, "RTStrCopy");
-        strcat(szTmpFilename, s_pszTmpSuff);
+        rc = RTStrCat(szTmpFilename, sizeof(szTmpFilename), s_pszTmpSuff);
+        if (RT_FAILURE(rc))
+            throw EIPRTFailure(rc, "RTStrCat");
 
         char szPrevFilename[RTPATH_MAX];

trunk/src/VBox/Runtime/testcase/tstRTR0CommonDriver.h

@@ -121 +121 @@
         rc = RTPathAppend(szPath, RTPATH_MAX, pszTestServiceName);
     if (RT_SUCCESS(rc))
-        strcat(szPath, ".r0");
+        rc = RTStrCat(szPath, sizeof(szPath), ".r0");
     if (RT_FAILURE(rc))
     {
@@ -129 +129 @@
 
     char szSrvReqHandler[sizeof(g_szSrvName) + sizeof("SrvReqHandler")];
-    strcpy(szSrvReqHandler, pszTestServiceName);
-    strcat(szSrvReqHandler, "SrvReqHandler");
+    rc = RTStrCopy(szSrvReqHandler, sizeof(szSrvReqHandler), pszTestServiceName);
+    if (RT_SUCCESS(rc))
+        rc = RTStrCat(szSrvReqHandler, sizeof(szSrvReqHandler), "SrvReqHandler");
+    if (RT_FAILURE(rc))
+    {
+        RTTestFailed(g_hTest, "RTStrCat failed with rc=%Rrc\n", rc);
+        return RTTestSummaryAndDestroy(g_hTest);
+    }
+
     for (size_t off = 0; RT_C_IS_LOWER(szSrvReqHandler[off]); off++)
         szSrvReqHandler[off] = RT_C_TO_UPPER(szSrvReqHandler[off]);