Changeset 70313 in vbox for trunk/src/VBox

Timestamp:

Dec 22, 2017 12:15:47 PM (7 years ago)

Author:

vboxsync

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

119910

Message:

IPRT/ldr: Made RTLdrEnumSymbols report forwards with value RTLDR_ENUM_SYMBOL_FWD_ADDRESS instead of skipping them.

File:

• trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp (modified) (3 diffs)

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

@@ -1238 +1238 @@
                  * Get address.
                  */
-                uintptr_t   uRVAExport = paAddress[uOrdinal];
+                uint32_t  uRVAExport = paAddress[uOrdinal];
                 RTUINTPTR Value;
-                if (  uRVAExport - (uintptr_t)pThis->ExportDir.VirtualAddress
-                    < pThis->ExportDir.Size)
-                {
-                    if (!(fFlags & RTLDR_ENUM_SYMBOL_FLAGS_NO_FWD))
-                    {
-                        /* Resolve forwarder. */
-                        AssertMsgFailed(("Forwarders are not supported!\n"));
-                    }
+                if (uRVAExport - pThis->ExportDir.VirtualAddress >= pThis->ExportDir.Size)
+                    Value = PE_RVA2TYPE(BaseAddress, uRVAExport, RTUINTPTR);
+                else if (!(fFlags & RTLDR_ENUM_SYMBOL_FLAGS_NO_FWD))
+                    Value = RTLDR_ENUM_SYMBOL_FWD_ADDRESS;
+                else
                     continue;
-                }
-
-                /* Get plain export address */
-                Value = PE_RVA2TYPE(BaseAddress, uRVAExport, RTUINTPTR);
 
                 /* Read in the name if found one. */
@@ -1336 +1329 @@
     uint32_t   *paRVANames = PE_RVA2TYPE(pvBits, pExpDir->AddressOfNames, uint32_t *);
     uint16_t   *paOrdinals = PE_RVA2TYPE(pvBits, pExpDir->AddressOfNameOrdinals, uint16_t *);
-    uint32_t    uNamePrev = 0;
-    unsigned    cOrdinals = RT_MAX(pExpDir->NumberOfNames, pExpDir->NumberOfFunctions);
+    uint32_t    uNamePrev  = 0;
+    unsigned    cOrdinals  = RT_MAX(pExpDir->NumberOfNames, pExpDir->NumberOfFunctions);
     for (unsigned uOrdinal = 0; uOrdinal < cOrdinals; uOrdinal++)
     {
@@ -1376 +1369 @@
              * Get address.
              */
-            uintptr_t   uRVAExport = paAddress[uOrdinal];
+            uint32_t  uRVAExport = paAddress[uOrdinal];
             RTUINTPTR Value;
-            if (  uRVAExport - (uintptr_t)pModPe->ExportDir.VirtualAddress
-                < pModPe->ExportDir.Size)
-            {
-                if (!(fFlags & RTLDR_ENUM_SYMBOL_FLAGS_NO_FWD))
-                {
-                    /* Resolve forwarder. */
-                    AssertMsgFailed(("Forwarders are not supported!\n"));
-                }
+            if (uRVAExport - pModPe->ExportDir.VirtualAddress >= pModPe->ExportDir.Size)
+                Value = PE_RVA2TYPE(BaseAddress, uRVAExport, RTUINTPTR);
+            else if (!(fFlags & RTLDR_ENUM_SYMBOL_FLAGS_NO_FWD))
+                Value = RTLDR_ENUM_SYMBOL_FWD_ADDRESS;
+            else
                 continue;
-            }
-
-            /* Get plain export address */
-            Value = PE_RVA2TYPE(BaseAddress, uRVAExport, RTUINTPTR);
 
             /*