Changeset 2887

Timestamp:

Nov 18, 2006, 4:37:00 PM (19 years ago)

Author:

bird

Message:

Bugfixing.

Location:

trunk/kLdr

Files:

• kLdrDyld.c (modified) (1 diff)
• kLdrModLX.c (modified) (3 diffs)

trunk/kLdr/kLdrDyld.c

@@ -695 +695 @@
     uint32_t iLoadEnd = kldrDyldStackFrameCompleted();
     if (rc)
+    {
+        kldrDyldModAddRef(pLoadedMod);
         kldrDyldStackCleanupOne(pLoadedMod, rc); /* in case it didn't get pushed onto the stack. */
+        kldrDyldModDeref(pLoadedMod);
+    }
 
     /*

trunk/kLdr/kLdrModLX.c

@@ -386 +386 @@
         if (pModLX->paObjs[i].o32_base + pModLX->paObjs[i].o32_size <= pModLX->paObjs[i].o32_base)
             return KLDR_ERR_LX_BAD_OBJECT_TABLE;
-        if (pModLX->paObjs[i].o32_mapsize > pModLX->paObjs[i].o32_size / OBJPAGELEN)
+        if (pModLX->paObjs[i].o32_mapsize > (pModLX->paObjs[i].o32_size + (OBJPAGELEN - 1)))
             return KLDR_ERR_LX_BAD_OBJECT_TABLE;
         if (    pModLX->paObjs[i].o32_mapsize
@@ -911 +911 @@
             break;
 
-        iName = *(pbNameTable + cbName)
-              | ((unsigned)*(pbNameTable + cbName + 1) << 8);
+        iName = *(pbNameTable + cbName + 1)
+              | ((unsigned)*(pbNameTable + cbName + 2) << 8);
         if (iName == iOrdinal)
             return pbNameTable;
@@ -927 +927 @@
 static int kldrModLXGetImport(PKLDRMOD pMod, const void *pvBits, uint32_t iImport, char *pszName, size_t cchName)
 {
-    /*PKLDRMODLX      pModLX = (PKLDRMODLX)pMod->pvData;*/
-    const uint8_t * pb = NULL;
+    PKLDRMODLX      pModLX = (PKLDRMODLX)pMod->pvData;
+    const uint8_t * pb;
     int             rc;
 
-    /** @todo */
-
+    /*
+     * Validate
+     */
+    if (iImport >= pModLX->Hdr.e32_impmodcnt)
+        return KLDR_ERR_IMPORT_ORDINAL_OUT_OF_BOUNDS;
+
+    /*
+     * Lazy loading the fixup section.
+     */
+    if (!pModLX->pbImportMods)
+    {
+        rc = kldrModLXDoLoadFixupSection(pModLX);
+        if (rc)
+            return rc;
+    }
+
+    /*
+     * Iterate the module import table until we reach the requested import ordinal.
+     */
+    pb = pModLX->pbImportMods;
+    while (iImport-- > 0)
+        pb += *pb + 1;
+
+    /*
+     * Copy out the result.
+     */
     if (*pb < cchName)
     {