Changeset 4106 for zzuf/trunk/srcTweet

Timestamp:

Dec 7, 2009, 7:34:21 PM (11 years ago)

Author:

Sam Hocevar

Message:

Fix memory leaks and infinite loops in the Win32 launcher.

File:

• zzuf/trunk/src/zzuf.c (modified) (6 diffs)

zzuf/trunk/src/zzuf.c

@@ -690 +690 @@
         {
             perror("pipe");
+            opts->seed++;
             return;
         }
@@ -696 +697 @@
     pid = run_process(opts, pipes);
     if(pid < 0)
+    {
+        fprintf(stderr, "error launching `%s'\n", opts->newargv[0]);
+        opts->seed++;
         return;
+    }
 
     /* We’re the parent, acknowledge spawn */
@@ -1175 +1180 @@
     PIMAGE_DOS_HEADER dos;
     PIMAGE_NT_HEADERS nt;
-    void *file, *map, *base;
+    void *file, *map, *base, *ret = NULL;
 
     file = CreateFile(name, GENERIC_READ, FILE_SHARE_READ,
                       NULL, OPEN_EXISTING, 0, NULL);
     if(file == INVALID_HANDLE_VALUE)
-        return NULL;
+        return ret;
 
     map = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL);
@@ -1186 +1191 @@
     {
         CloseHandle(file);
-        return NULL;
+        return ret;
     }
 
@@ -1194 +1199 @@
         CloseHandle(map);
         CloseHandle(file);
-        return NULL;
+        return ret;
     }
 
@@ -1200 +1205 @@
     dos = (PIMAGE_DOS_HEADER)base;
     nt = (PIMAGE_NT_HEADERS)((char *)base + dos->e_lfanew);
-    if(dos->e_magic != IMAGE_DOS_SIGNATURE
-      || nt->Signature != IMAGE_NT_SIGNATURE
-      || nt->FileHeader.Machine != IMAGE_FILE_MACHINE_I386
-      || nt->OptionalHeader.Magic != 0x10b /* IMAGE_NT_OPTIONAL_HDR32_MAGIC */)
-    {
-        UnmapViewOfFile(base);
-        CloseHandle(map);
-        CloseHandle(file);
-        return NULL;
-    }
-
-    return (void *)(uintptr_t)(nt->OptionalHeader.ImageBase +
-                                 nt->OptionalHeader.AddressOfEntryPoint);
+    if(dos->e_magic == IMAGE_DOS_SIGNATURE /* 0x5A4D */
+      && nt->Signature == IMAGE_NT_SIGNATURE /* 0x00004550 */
+      && nt->FileHeader.Machine == IMAGE_FILE_MACHINE_I386 
+      && nt->OptionalHeader.Magic == 0x10b /* IMAGE_NT_OPTIONAL_HDR32_MAGIC */)
+    {
+        ret = (void *)(uintptr_t)(nt->OptionalHeader.ImageBase +
+                                  nt->OptionalHeader.AddressOfEntryPoint);
+    }
+
+    UnmapViewOfFile(base);
+    CloseHandle(map);
+    CloseHandle(file);
+
+    return ret;
 }
 #endif