Changeset 7350 for trunk/src

Timestamp:

Nov 15, 2001, 4:00:15 PM (24 years ago)

Author:

phaller

Message:

.

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.90 2001-10-09 20:25:21 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.91 2001-11-15 14:59:06 phaller Exp $ */
 
 /*
@@ -180 +180 @@
 
     hFile = OSLibDosOpen(szFileName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
-
+  
+    dprintf((LOG, "KERNEL32-PELDR: Opening PE-image (%s) returned handle %08xh.\n",
+             szFileName,
+             hFile));
+  
     //default error:
     strcpy(szErrorModule, OSLibStripPath(szFileName));
@@ -693 +697 @@
             return rc;
         }
+      
+      // PH 2001-11-15
+      // For corrupt or misinterpreted PE headers,
+      // the preceeding DosSetFilePtr may have moved the
+      // file pointer at or behind the file's end.
+      // DosRead will then return rc=0 and ulReadBytes=0.
+      // This must NOT lead to an infinite loop.
+      if (ulReadBytes == 0)
+      {
+        return ERROR_INTERNAL;
+      }
 
         ulSize -= ulReadBytes;