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

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

161579

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

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmod.cpp (modified) (1 diff)

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;
             }
         }