Changeset 3757 for trunk/src/kernel32/winimagepeldr.cpp

Timestamp:

Jun 26, 2000, 2:23:54 PM (25 years ago)

Author:

sandervl

Message:

fix for fixup crash in vaj

File:

• trunk/src/kernel32/winimagepeldr.cpp (modified) (7 diffs)

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.47 2000-06-08 18:08:57 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.48 2000-06-26 12:23:54 sandervl Exp $ */
 
 /*
@@ -105 +105 @@
     imageVirtBase(-1), realBaseAddress(0), imageVirtEnd(0),
     nrNameExports(0), nrOrdExports(0), nameexports(NULL), ordexports(NULL),
-    memmap(NULL), pFixups(NULL)
+    memmap(NULL), pFixups(NULL), dwFixupSize(0)
 {
  HFILE  dllfile;
@@ -464 +464 @@
 
    if(realBaseAddress != oh.ImageBase) {
-        pFixups = (PIMAGE_BASE_RELOCATION)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_BASERELOC);
+        pFixups     = (PIMAGE_BASE_RELOCATION)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_BASERELOC);
+        dwFixupSize = ImageDirectorySize(win32file, IMAGE_DIRECTORY_ENTRY_BASERELOC);
         commitPage((ULONG)pFixups, FALSE);
    }
@@ -621 +622 @@
                 return FALSE;
         }
-        if(realBaseAddress != oh.ImageBase) {
-                setFixups(virtAddress, sectionsize);
-        }
+        setFixups(virtAddress, sectionsize);
 
         rc = DosSetMem((PVOID)virtAddress, sectionsize, protflags);
@@ -637 +636 @@
                 return FALSE;
         }
-        if(realBaseAddress != oh.ImageBase) {
-                setFixups(virtAddress, sectionsize);
-        }
+        setFixups(virtAddress, sectionsize);
+
         rc = DosSetMem((PVOID)virtAddress, sectionsize, protflags);
         if(rc) {
@@ -872 +870 @@
  PIMAGE_BASE_RELOCATION prel = pFixups;
 
-  if(fh.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) {
+  if(realBaseAddress == oh.ImageBase || fh.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) {
         return(TRUE);
   }
@@ -883 +881 @@
   if(prel) {
         j = 1;
-        while(prel->VirtualAddress && prel->VirtualAddress < virtAddress) {
+        while(((ULONG)prel < (ULONG)pFixups+dwFixupSize) && 
+              prel->VirtualAddress && prel->VirtualAddress < virtAddress) 
+        {
                 prel = (PIMAGE_BASE_RELOCATION)((char*)prel + prel->SizeOfBlock);
         }
-        while(prel->VirtualAddress && prel->VirtualAddress < virtAddress + size) {
+        while(((ULONG)prel < (ULONG)pFixups+dwFixupSize) && 
+              prel->VirtualAddress && prel->VirtualAddress < virtAddress + size) 
+        {
                 page = (char *)((char *)prel + (ULONG)prel->VirtualAddress);
                 count  = (prel->SizeOfBlock - 8)/2;