Changeset 4137 for zzuf/trunk/srcTweet

Timestamp:

Dec 16, 2009, 5:15:40 PM (11 years ago)

Author:

Sam Hocevar

Message:

Synchronise VS 2010 solution with [4112].

File:

• zzuf/trunk/src/myfork.c (modified) (4 diffs)

zzuf/trunk/src/myfork.c

@@ -266 +266 @@
 
     /* Get the child process's entry point address */
-    epaddr = (void *)(get_base_address(pinfo.dwProcessId)
-                       + get_entry_point_offset(opts->newargv[0]));
+    epaddr = (void *)get_entry_point(opts->newargv[0],
+                                     pinfo.dwProcessId);
     if(!epaddr)
         return -1;
@@ -414 +414 @@
 }
 
-/* Find the process's base address once it is loaded in memory (the header
- * information is unreliable because of Vista's ASLR). */
-static intptr_t get_base_address(DWORD pid)
-{
-    MODULEENTRY32 entry;
-    intptr_t ret = 0;
-    void *list;
-    int k;
-
-    list = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, pid);
-    entry.dwSize = sizeof(entry);
-    for(k = Module32First(list, &entry); k; k = Module32Next(list, &entry))
-    {
-        /* FIXME: how do we select the correct module? */
-        ret = (intptr_t)entry.modBaseAddr;
-    }
-    CloseHandle(list);
-
-    return ret;
-}
-
 /* Find the process's entry point address offset. The information is in
  * the file's PE header. */
-static intptr_t get_entry_point_offset(char const *name)
+static intptr_t get_entry_point(char const *name, DWORD pid)
 {
     PIMAGE_DOS_HEADER dos;
@@ -472 +451 @@
       && nt->OptionalHeader.Magic == 0x10b /* IMAGE_NT_OPTIONAL_HDR32_MAGIC */)
     {
-        ret = (intptr_t)nt->OptionalHeader.AddressOfEntryPoint;
+        ret = get_base_address(pid);
+        /* Base address not found in the running process. Falling back
+         * to the header's information, which is unreliable because of
+         * Vista's address space randomisation. */
+        if (!ret)
+            ret = (intptr_t)nt->OptionalHeader.BaseOfCode;
+
+        ret += (intptr_t)nt->OptionalHeader.AddressOfEntryPoint;
     }
 
@@ -481 +467 @@
     return ret;
 }
-#endif
-
+
+/* Find the process's base address once it is loaded in memory (the header
+ * information is unreliable because of Vista's ASLR). */
+static intptr_t get_base_address(DWORD pid)
+{
+    MODULEENTRY32 entry;
+    intptr_t ret = 0;
+    void *list;
+    int k;
+
+    list = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, pid);
+    entry.dwSize = sizeof(entry);
+    for(k = Module32First(list, &entry); k; k = Module32Next(list, &entry))
+    {
+        /* FIXME: how do we select the correct module? */
+        ret = (intptr_t)entry.modBaseAddr;
+    }
+    CloseHandle(list);
+
+    return ret;
+}
+
+#endif