Changeset 77981 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Apr 1, 2019 6:49:03 PM (6 years ago)

Author:

vboxsync

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

129748

Message:

Runtime/dbgmod.cpp: Make RTDbgModCreateFromMap(), RTDbgModCreateFromImage(), rtDbgModFromPeImageOpenCallback() and rtDbgModFromMachOImageOpenDsymMachOCallback() return VERR_DBG_NO_MATCHING_INTERPRETER (like it was probably intended to) if no matching backend was found instead of just returning the error code (like VERR_EOF) of the last backend tried

File:

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

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

@@ -413 +413 @@
                 if (RT_SUCCESS(rc))
                 {
-                    rc = VERR_DBG_NO_MATCHING_INTERPRETER;
                     for (PRTDBGMODREGDBG pCur = g_pDbgHead; pCur; pCur = pCur->pNext)
                     {
@@ -433 +432 @@
 
                     /* bail out */
+                    rc = VERR_DBG_NO_MATCHING_INTERPRETER;
                     RTSemRWReleaseRead(g_hDbgModRWSem);
                 }
@@ -836 +836 @@
                 if (RT_SUCCESS(rc))
                 {
-                    rc = VERR_DBG_NO_MATCHING_INTERPRETER;
                     PRTDBGMODREGIMG pImg;
                     for (pImg = g_pImgHead; pImg; pImg = pImg->pNext)
@@ -913 +912 @@
 
                     /* bail out */
+                    rc = VERR_DBG_NO_MATCHING_INTERPRETER;
                     RTSemRWReleaseRead(g_hDbgModRWSem);
                 }
@@ -980 +980 @@
             pDbgMod->pImgVt    = pImg->pVt;
             pDbgMod->pvImgPriv = NULL;
-            rc = pImg->pVt->pfnTryOpen(pDbgMod, RTLDRARCH_WHATEVER);
-            if (RT_SUCCESS(rc))
+            int rc2 = pImg->pVt->pfnTryOpen(pDbgMod, RTLDRARCH_WHATEVER);
+            if (RT_SUCCESS(rc2))
+            {
+                rc = rc2;
                 break;
+            }
             pDbgMod->pImgVt    = NULL;
             Assert(pDbgMod->pvImgPriv == NULL);
@@ -1256 +1259 @@
             pDbgMod->pImgVt    = pImg->pVt;
             pDbgMod->pvImgPriv = NULL;
-            rc = pImg->pVt->pfnTryOpen(pDbgMod, pArgs->enmArch);
-            if (RT_SUCCESS(rc))
+            int rc2 = pImg->pVt->pfnTryOpen(pDbgMod, pArgs->enmArch);
+            if (RT_SUCCESS(rc2))
+            {
+                rc = rc2;
                 break;
+            }
             pDbgMod->pImgVt    = NULL;
             Assert(pDbgMod->pvImgPriv == NULL);