Changeset 51794 in vbox for trunk/src

Timestamp:

Jul 1, 2014 11:40:38 PM (11 years ago)

Author:

vboxsync

Message:

Darwin loader rc fix (VERR_INVALID_EXE_SIGNATURE).

File:

• trunk/src/VBox/Runtime/common/ldr/ldrEx.cpp (modified) (1 diff)

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

@@ -177 +177 @@
     {
         int rc2 = rtldrkLdrOpen(pReader, fFlags, enmArch, phMod, pErrInfo);
-        if (rc2 == VERR_MZ_EXE_NOT_SUPPORTED) /* Quick fix for bad return code. */
-            rc = rc;
+        if (   RT_SUCCESS(rc2)
+            || (rc == VERR_INVALID_EXE_SIGNATURE && rc2 != VERR_MZ_EXE_NOT_SUPPORTED /* Quick fix for bad return code. */)
+            || rc2 >  VERR_INVALID_EXE_SIGNATURE
+            || rc2 <= VERR_BAD_EXE_FORMAT)
+            rc = rc2;
     }
 #endif