Changeset 85969 in vbox

Timestamp:

Aug 31, 2020 11:50:11 PM (5 years ago)

Author:

vboxsync

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

140164

Message:

VMM/DBGFR3ModInMem.cpp: Don't call RTDbgModCreateFromMachOImage unless we've got a loader handle, it'll just assert and return VERR_INVALID_PARAMETER.

File:

• trunk/src/VBox/VMM/VMMR3/DBGFR3ModInMem.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/DBGFR3ModInMem.cpp

@@ -509 +509 @@
                 rc = dbgfModInMemCommon_Init(pThis, pUVM, pImageAddr, puBuf->aMappings, cMappings,
                                              pszName, enmArch, &hLdrMod, pErrInfo);
-                if (RT_FAILURE(rc))
+                if (RT_SUCCESS(rc)) /* Don't bother if we don't have a handle. */
+                {
+                    RTDBGMOD hMod;
+                    rc = RTDbgModCreateFromMachOImage(&hMod, pszFilename ? pszFilename : pszName, pszName, enmArch,
+                                                      &hLdrMod, 0 /*cbImage*/, 0, NULL, &Uuid, DBGFR3AsGetConfig(pUVM), fFlags);
+                    if (RT_SUCCESS(rc))
+                        *phDbgMod = hMod;
+                }
+                else
                     hLdrMod = NIL_RTLDRMOD;
 
-                RTDBGMOD hMod;
-                rc = RTDbgModCreateFromMachOImage(&hMod, pszFilename ? pszFilename : pszName, pszName, enmArch,
-                                                  &hLdrMod, 0 /*cbImage*/, 0, NULL, &Uuid, DBGFR3AsGetConfig(pUVM), fFlags);
-                if (RT_SUCCESS(rc))
-                    *phDbgMod = hMod;
 #if 0 /** @todo later */
-                else if (!(fFlags & DBGFMODINMEM_F_NO_CONTAINER_FALLBACK))
+                if (RT_FAILURE(rc) && !(fFlags & DBGFMODINMEM_F_NO_CONTAINER_FALLBACK))
                 {
                     /*