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

Timestamp:

Jul 26, 2002, 12:46:56 PM (23 years ago)

Author:

sandervl

Message:

protect larger part of on demand page handler (DosEnterCritSec)

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.100 2002-07-24 11:29:23 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.101 2002-07-26 10:46:56 sandervl Exp $ */
 
 /*
@@ -743 +743 @@
  ULONG    ulNewPos, ulRead, orgVirtAddress = virtAddress;
  APIRET   rc;
+ BOOL     fCriticalSection = FALSE;
 
     dprintf((LOG, "Win32PeLdrImage::commitPage %x %d %d", virtAddress, fWriteAccess, fPageCmd));
@@ -796 +797 @@
         return TRUE;
     }
+    rc = DosEnterCritSec();
+    if(rc) {
+        dprintf((LOG, "DosEnterCritSec failed with rc %d", rc));
+        goto fail;
+    }
+    //tell fail handler to call DosExitCritSec
+    fCriticalSection = TRUE;
+
     //Check range of pages with the same attributes starting at virtAddress
     //(some pages might already have been loaded)
@@ -802 +811 @@
     if(rc) {
         dprintf((LOG, "Win32PeLdrImage::commitPage: DosQueryMem for %x returned %d", virtAddress, rc));
-        return FALSE;
+        goto fail;
     }
     if(attr & PAG_COMMIT) {
         dprintf((LOG, "Win32PeLdrImage::commitPage: Memory at 0x%x already committed!", virtAddress));
-        return FALSE;
+        goto fail;
     }
 
@@ -824 +833 @@
 
     if(size && fileoffset != -1) {
-        rc = DosEnterCritSec();
-        if(rc) {
-            dprintf((LOG, "DosEnterCritSec failed with rc %d", rc));
-            goto fail;
-        }
         rc = DosSetMem((PVOID)virtAddress, sectionsize, PAG_READ|PAG_WRITE|PAG_COMMIT);
         if(rc) {
-            DosExitCritSec();
             dprintf((LOG, "Win32PeLdrImage::commitPage: DosSetMem failed (%d)!", rc));
             goto fail;
@@ -837 +840 @@
 
         if(DosSetFilePtr(hFile, ulPEOffset+fileoffset, FILE_BEGIN, &ulNewPos) == -1) {
-            DosExitCritSec();
             dprintf((LOG, "Win32PeLdrImage::commitPage: DosSetFilePtr failed for 0x%x!", fileoffset));
             goto fail;
@@ -850 +852 @@
 #endif
         if(rc) {
-            DosExitCritSec();
             dprintf((LOG, "Win32PeLdrImage::commitPage: DosRead failed for 0x%x %x %x %x (rc=%d)!", virtAddress, size, ulRead, fileoffset, rc));
             goto fail;
         }
         if(ulRead != size) {
-            DosExitCritSec();
             dprintf((LOG, "Win32PeLdrImage::commitPage: DosRead failed to read %x (%x) bytes at %x for 0x%x!", size, ulRead, fileoffset, virtAddress));
             goto fail;
@@ -862 +862 @@
 
         rc = DosSetMem((PVOID)virtAddress, sectionsize, protflags);
-        DosExitCritSec();
         if(rc) {
             dprintf((LOG, "Win32PeLdrImage::commitPage: DosSetMem failed (%d)!", rc));
@@ -869 +868 @@
     }
     else {
-        rc = DosEnterCritSec();
-        if(rc) {
-            dprintf((LOG, "DosEnterCritSec failed with rc %d", rc));
-            goto fail;
-        }
-
         rc = DosSetMem((PVOID)virtAddress, sectionsize, PAG_READ|PAG_WRITE|PAG_COMMIT);
-        if(rc) {
-            DosExitCritSec();
-            dprintf((LOG, "Win32PeLdrImage::commitPage: DosSetMem failed (%d)!", rc));
-            goto fail;
-        }
-        setFixups(virtAddress, sectionsize);
-
-        rc = DosSetMem((PVOID)virtAddress, sectionsize, protflags);
-        DosExitCritSec();
         if(rc) {
             dprintf((LOG, "Win32PeLdrImage::commitPage: DosSetMem failed (%d)!", rc));
             goto fail;
         }
-    }
+        setFixups(virtAddress, sectionsize);
+
+        rc = DosSetMem((PVOID)virtAddress, sectionsize, protflags);
+        if(rc) {
+            dprintf((LOG, "Win32PeLdrImage::commitPage: DosSetMem failed (%d)!", rc));
+            goto fail;
+        }
+    }
+    DosExitCritSec();
     return TRUE;
 
 fail:
+    if(fCriticalSection) DosExitCritSec();
     return FALSE;
 }