Changeset 6009 for trunk/src/win32k/ldr/myldrOpen.cpp

Timestamp:

Jun 14, 2001, 2:19:41 PM (24 years ago)

Author:

bird

Message:

Close file on error.

File:

• trunk/src/win32k/ldr/myldrOpen.cpp (modified) (6 diffs)

trunk/src/win32k/ldr/myldrOpen.cpp

@@ -1 @@
-/* $Id: myldrOpen.cpp,v 1.15 2001-02-11 23:43:51 bird Exp $
+/* $Id: myldrOpen.cpp,v 1.16 2001-06-14 12:19:41 bird Exp $
  *
  * myldrOpen - ldrOpen.
@@ -296 +296 @@
                     kprintf(("myldrOpen-%d: pe.exe - opening\n", cNesting));
                     ldrClose(*phFile);
+                    *phFile = 0xFFFF;
                     strcpy(u1.pach, "PE.EXE");
                     rc = ldrOpen(phFile, u1.pach, pfl); /* This isn't recusive! */
@@ -424 +425 @@
 
                 ldrClose(*phFile);
+                *phFile = 0xFFFF;
                 rc = ldrOpen(phFile, ".\\JAVA.EXE", pfl);
                 if (rc != NO_ERROR)
@@ -641 +643 @@
                     }
                     ldrClose(*phFile);
+                    *phFile = 0xFFFF;
                     rc = myldrOpen(phFile, psz, pfl);
                     if (rc != NO_ERROR)
@@ -712 +715 @@
             kprintf(("myldrOpen-%d: Found REXX script\n", cNesting));
             ldrClose(*phFile);
+            *phFile = 0xFFFF;
             psz = "KRX.EXE";
             rc = ldrOpen(phFile, psz, pfl);
@@ -753 +757 @@
          */
     cleanup:
+        if (rc && *phFile != 0xFFFF)
+        {
+            ldrClose(*phFile);
+            *phFile = 0xFFFF;
+        }
         rfree(u1.pach);
         cNesting--;