Changeset 74856 in vbox for trunk/src/VBox/Runtime/testcase/tstLdr-3.cpp

Timestamp:

Oct 16, 2018 12:49:25 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/ldr: Must check that JmpStubsRVA isn't NIL and not use it blindly now that everything isn't MH_OBJECT. Return VERR_LDR_ADDRESS_OVERFLOW if nil. bugref:9232

File:

• trunk/src/VBox/Runtime/testcase/tstLdr-3.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/testcase/tstLdr-3.cpp

@@ -46 +46 @@
 static void     *g_pvBits;
 static uint8_t   g_cBits;
+static uint8_t   g_fNearImports;
 
 /**
@@ -215 +216 @@
 {
     RT_NOREF5(hLdrMod, pszModule, pszSymbol, uSymbol, pvUser);
-#if 1
     RTUINTPTR BaseAddr = *(PCRTUINTPTR)pvUser;
-    *pValue = BaseAddr + UINT32_C(0x604020f0);
-#else
-    *pValue = UINT64_C(0xffffff7f820df000);
-#endif
+    if (g_fNearImports)
+        *pValue = BaseAddr + UINT32_C(0x604020f0);
+    else if (   BaseAddr < UINT64_C(0xffffff7f820df000) - _4G
+             || BaseAddr > UINT64_C(0xffffff7f820df000) + _4G)
+        *pValue = UINT64_C(0xffffff7f820df000);
+    else
+        *pValue = UINT64_C(0xffffff7c820df000);
     if (g_cBits == 32)
         *pValue &= UINT32_MAX;
@@ -289 +292 @@
     RTR3InitExe(argc, &argv, 0);
 
-    int rcRet = 0;
-    if (argc <= 2)
-    {
-        RTPrintf("usage: %s <load-addr> <module> [addr1 []]\n", argv[0]);
-        return 1;
-    }
-
     /*
      * Module & code bitness (optional).
      */
     g_cBits = ARCH_BITS;
-    if (!strcmp(argv[1], "--32"))
-    {
-        g_cBits = 32;
+#if !defined(RT_OS_WINDOWS) || defined(RT_OS_DARWIN)
+    g_fNearImports = false;
+#else
+    g_fNearImports = true;
+#endif
+    while (argc > 1)
+    {
+        if (!strcmp(argv[1], "--32"))
+            g_cBits = 32;
+        else if (!strcmp(argv[1], "--64"))
+            g_cBits = 64;
+        else if (!strcmp(argv[1], "--near-imports"))
+            g_fNearImports = true;
+        else if (!strcmp(argv[1], "--wide-imports"))
+            g_fNearImports = false;
+        else
+            break;
         argc--;
         argv++;
     }
-    else if (!strcmp(argv[1], "--64"))
-    {
-        g_cBits = 64;
-        argc--;
-        argv++;
+
+    int rcRet = 0;
+    if (argc <= 2)
+    {
+        RTPrintf("usage: %s [--32|--64] [--<near|wide>-imports] <load-addr> <module> [addr1 []]\n", argv[0]);
+        return 1;
     }