Changeset 52416 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Aug 19, 2014 2:40:27 PM (10 years ago)

Author:

vboxsync

Message:

SUPR3HardenedMainImports-win.cpp: Fixed bug in x86 syscall variation for functions not taking any parameters.

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPR3HardenedMainImports-win.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/win/SUPR3HardenedMainImports-win.cpp

@@ -498 +498 @@
                     && pbFunction[11] == pSyscall->cbParams
                     && pbFunction[12] == 0x00)
-                || (   pbFunction[12] == 0xc3 /* ret */
+                || (   pbFunction[10] == 0xc3 /* ret */
                     && pSyscall->cbParams == 0)
                )
@@ -512 +512 @@
      * Failed to parse it.
      */
+    volatile uint8_t abCopy[16];
+    memcpy((void *)&abCopy[0], pbFunction, sizeof(abCopy));
     SUPHNTIMP_ERROR(17, "supR3HardenedWinInitImports", kSupInitOp_Misc, rc,
-                    "%ls: supHardNtLdrCacheOpen failed: %Rrc '%s'.", g_aSupNtImpDlls[iDll].pwszName, rc);
+                    "%ls: supHardNtLdrCacheOpen failed: '%s': %.16Rhxs",
+                    g_aSupNtImpDlls[iDll].pwszName, pImport->pszName, &abCopy[0]);
 }