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

Timestamp:

Jun 24, 2021 6:24:12 PM (3 years ago)

Author:

vboxsync

Message:

Runtime/common/dbg/dbgmodghidra.cpp: Some fixes

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmodghidra.cpp (modified) (3 diffs)

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

@@ -246 +246 @@
                 pelmSym->getAttributeValue("name", &pszSymName);
 
-            if (pszSymName)
+            if (   pszSymName
+                && strlen(pszSymName) < RTDBG_SYMBOL_NAME_LENGTH)
             {
                 uint64_t u64Addr = 0;
@@ -254 +255 @@
                 {
                     int rc = RTDbgModSymbolAdd(hCnt, pszSymName, RTDBGSEGIDX_RVA, u64Addr, u64Length, 0 /*fFlags*/, NULL);
-                    if (    RT_FAILURE(rc)
-                        &&  rc != VERR_DBG_DUPLICATE_SYMBOL
-                        &&  rc != VERR_DBG_ADDRESS_CONFLICT) /* (don't be too strict) */
+                    if (   RT_FAILURE(rc)
+                        && rc != VERR_DBG_DUPLICATE_SYMBOL
+                        && rc != VERR_DBG_ADDRESS_CONFLICT
+                        && rc != VERR_DBG_INVALID_RVA) /* (don't be too strict) */
                         return rc;
                 }
@@ -380 +382 @@
      * Fend off images.
      */
-    if (   !pMod->pszDbgFile
-        || pMod->pImgVt)
+    if (!pMod->pszDbgFile)
         return VERR_DBG_NO_MATCHING_INTERPRETER;
     pMod->pvDbgPriv = NULL;