Changeset 2854 for trunk/kLdr/kLdrDyldMod.c

Timestamp:

Nov 3, 2006, 4:39:12 AM (19 years ago)

Author:

bird

Message:

Hacking away on the PE module interpreter.

File:

• trunk/kLdr/kLdrDyldMod.c (modified) (5 diffs)

trunk/kLdr/kLdrDyldMod.c

@@ -884 +884 @@
                                              PKLDRADDR puValue, uint32_t *pfKind, void *pvUser)
 {
+    static int s_cRecursiveCalls = 0;
+    PKLDRDYLDMOD pDyldMod = (PKLDRDYLDMOD)pvUser;
     int rc;
-    PKLDRDYLDMOD pDyldMod = (PKLDRDYLDMOD)pvUser;
+
+    /* guard against too deep forwarder recursion. */
+    if (s_cRecursiveCalls >= 5)
+        return KLDR_ERR_TOO_LONG_FORWARDER_CHAIN;
+    s_cRecursiveCalls++;
 
     if (iImport != NIL_KLDRMOD_IMPORT)
@@ -901 +907 @@
 
         rc = kLdrModQuerySymbol(pPrereqMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP,
-                                uSymbol, pszSymbol, puValue, pfKind);
+                                uSymbol, pszSymbol, kldrDyldModFixupGetImportCallback, pPrereqMod, puValue, pfKind);
         if (rc)
         {
@@ -923 +929 @@
             KLDRADDR uValue;
             rc = kLdrModQuerySymbol(pBindMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP,
-                                    uSymbol, pszSymbol, &uValue, &fKind);
+                                    uSymbol, pszSymbol, kldrDyldModFixupGetImportCallback, pPrereqMod, &uValue, &fKind);
             if (    !rc
                 &&  (   !fFound
@@ -950 +956 @@
     }
 
+    s_cRecursiveCalls--;
     return rc;
 }
@@ -1205 +1212 @@
 
     rc = kLdrModQuerySymbol(pMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP,
-                            uSymbolOrdinal, pszSymbolName, &uValue, &fKind);
+                            uSymbolOrdinal, pszSymbolName, kldrDyldModFixupGetImportCallback, pPrereqMod,
+                            &uValue, &fKind);
     if (!rc)
     {