Changeset 75188 in vbox for trunk

Timestamp:

Oct 30, 2018 4:46:17 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/dbgmoddbghelp.cpp: Don't panic if RVA=NIL_RTLDRADDR and make sure we return failures on failure.

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmoddbghelp.cpp (modified) (5 diffs)

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

@@ -57 +57 @@
     PRTDBGMODINT    pMod;
     uint64_t        uModAddr;
+    RTLDRADDR       uNextRva;
 
     /** UTF-8 version of the previous file name. */
@@ -367 +368 @@
 
 
-/** @callback_method_impl{FNRTLDRENUMSEGS, Copies the PE segments over into
- *                       the container.} */
+/** @callback_method_impl{FNRTLDRENUMSEGS,
+ * Copies the PE segments over into the container.} */
 static DECLCALLBACK(int) rtDbgModDbgHelpAddSegmentsCallback(RTLDRMOD hLdrMod, PCRTLDRSEG pSeg, void *pvUser)
 {
@@ -380 +381 @@
     Assert(!pSeg->pszName[pSeg->cchName]);
 
-    if (!pSeg->RVA)
+    RTLDRADDR cb   = RT_MAX(pSeg->cb, pSeg->cbMapped);
+    RTLDRADDR uRva = pSeg->RVA;
+    if (!uRva)
         pArgs->uModAddr = pSeg->LinkAddress;
-
-    RTLDRADDR cb = RT_MAX(pSeg->cb, pSeg->cbMapped);
-    return RTDbgModSegmentAdd(pArgs->hCnt, pSeg->RVA, cb, pSeg->pszName, 0 /*fFlags*/, NULL);
+    else if (uRva == NIL_RTLDRADDR)
+    {
+        cb   = 0;
+        uRva = pArgs->uNextRva;
+    }
+    pArgs->uNextRva = uRva + cb;
+
+    return RTDbgModSegmentAdd(pArgs->hCnt, uRva, cb, pSeg->pszName, 0 /*fFlags*/, NULL);
 }
 
@@ -457 +465 @@
                     {
                         rc = RTErrConvertFromWin32(GetLastError());
+                        if (RT_SUCCESS_NP(rc))
+                            rc = VERR_DBG_NO_MATCHING_INTERPRETER;
                         LogFlow(("rtDbgModDbgHelp_TryOpen: Error loading the module '%s' at %#llx: %Rrc (%u)\n",
                                  pMod->pszDbgFile, (uint64_t)uImageBase, rc, GetLastError()));
@@ -470 +480 @@
             {
                 rc = RTErrConvertFromWin32(GetLastError());
+                if (RT_SUCCESS_NP(rc))
+                    rc = VERR_DBG_NO_MATCHING_INTERPRETER;
                 LogFlow(("rtDbgModDbgHelp_TryOpen: SymInitialize failed: %Rrc (%u)\n", rc, GetLastError()));
             }