Changeset 103438 in vbox

Timestamp:

Feb 19, 2024 1:41:38 PM (9 months ago)

Author:

vboxsync

Message:

IPRT/dbgmod: Simplified and restored old alloca errora handling behavior in rtDbgModOpenDebugInfoExternalToImageCallback. bugref:3409

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmod.cpp (modified) (2 diffs)

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

@@ -597 +597 @@
          * the latter can be normalized or using a different name (e.g. 'nt').
          */
-        const char *pszExt = NULL;
+        const char *pszExtSuff = NULL;
+        size_t      cchExtSuff = 0;
         if (pDbgInfo->enmType == RTLDRDBGINFOTYPE_CODEVIEW_DBG)
-            pszExt = ".dbg";
+            pszExtSuff = ".dbg", cchExtSuff = sizeof(".dbg") - 1;
         else if (   pDbgInfo->enmType == RTLDRDBGINFOTYPE_CODEVIEW_PDB20
                  || pDbgInfo->enmType == RTLDRDBGINFOTYPE_CODEVIEW_PDB70)
-            pszExt = ".pdb";
-        if (pszExt)
+            pszExtSuff = ".pdb", cchExtSuff = sizeof(".pdb") - 1;
+        if (pszExtSuff)
         {
             const char * const pszName = pDbgMod->pszImgFile
@@ -610 +611 @@
             if (pszName)
             {
-                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;
+                const char * const  pszOldSuff    = RTPathSuffix(pszName);
+                size_t const        cchName       = pszOldSuff ? (size_t)(pszOldSuff - pszName) : strlen(pszName);
+                char * const        pszExtFileBuf = (char *)alloca(cchName + cchExtSuff + 1);
+                if (pszExtFileBuf)
+                {
+                    memcpy(mempcpy(pszExtFileBuf, pszName, cchName), pszExtSuff, cchExtSuff + 1);
+                    pszExtFile = pszExtFileBuf;
+                }
             }
         }