Changeset 46083 in vbox for trunk/src/VBox/Runtime/common/ldr/ldrMemory.cpp

Timestamp:

May 14, 2013 11:39:28 PM (12 years ago)

Author:

vboxsync

Message:

Made it possible to find symbols for windows nt using a image-in-guest-memory loader fallback.

File:

• trunk/src/VBox/Runtime/common/ldr/ldrMemory.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrMemory.cpp

@@ -264 +264 @@
     LogFlow(("RTLdrOpenInMemory: pszName=%p:{%s} fFlags=%#x enmArch=%d cbImage=%#zu pfnRead=%p pfnDtor=%p pvUser=%p phLdrMod=%p\n",
              pszName, pszName, fFlags, enmArch, cbImage, pfnRead, pfnDtor, pvUser, phLdrMod));
-    AssertMsgReturn(!(fFlags & ~RTLDR_O_VALID_MASK), ("%#x\n", fFlags), VERR_INVALID_PARAMETER);
-    AssertMsgReturn(enmArch > RTLDRARCH_INVALID && enmArch < RTLDRARCH_END, ("%d\n", enmArch), VERR_INVALID_PARAMETER);
+
     if (!pfnRead || !pfnDtor)
         AssertPtrReturn(pvUser, VERR_INVALID_POINTER);
+    if (!pfnDtor)
+        pfnDtor = rtldrRdrMemDefaultDtor;
+    else
+        AssertPtrReturn(pfnRead, VERR_INVALID_POINTER);
+
+    /* The rest of the validations will call the destructor. */
+    AssertMsgReturnStmt(!(fFlags & ~RTLDR_O_VALID_MASK), ("%#x\n", fFlags),
+                        pfnDtor(pvUser), VERR_INVALID_PARAMETER);
+    AssertMsgReturnStmt(enmArch > RTLDRARCH_INVALID && enmArch < RTLDRARCH_END, ("%d\n", enmArch),
+                        pfnDtor(pvUser), VERR_INVALID_PARAMETER);
     if (!pfnRead)
         pfnRead = rtldrRdrMemDefaultReader;
     else
-        AssertPtrReturn(pfnRead, VERR_INVALID_POINTER);
-    if (!pfnDtor)
-        pfnDtor = rtldrRdrMemDefaultDtor;
-    else
-        AssertPtrReturn(pfnRead, VERR_INVALID_POINTER);
-    AssertReturn(cbImage > 0, VERR_INVALID_PARAMETER);
-
+        AssertReturnStmt(RT_VALID_PTR(pfnRead), pfnDtor(pvUser), VERR_INVALID_POINTER);
+    AssertReturnStmt(cbImage > 0, pfnDtor(pvUser), VERR_INVALID_PARAMETER);
 
     /*
@@ -304 +308 @@
             return rc;
         }
+
         pReader->pfnDestroy(pReader);
     }
+    else
+        pfnDtor(pvUser),
     *phLdrMod = NIL_RTLDRMOD;
+
     LogFlow(("RTLdrOpen: return %Rrc\n", rc));
     return rc;