commit 875b5db17bbedaeed7044bd81494d72f43f7a545
author Alexandre Julliard <julliard@winehq.org> Wed Jul 19 15:06:16 2006 +0200
committer Alexandre Julliard <julliard@winehq.org> Wed Jul 19 15:06:16 2006 +0200
tree 076eaf612ab99b8c103521416a1df8da6cf5afa4
parent 763e96abaea6d31a0f387ec2c0002f83da24ae6b

preloader: Make sure the WINEPRELOADRESERVE area doesn't overlap the low memory area.

loader/preloader.c

diff --git a/loader/preloader.c b/loader/preloader.c
index 274d858..d9b749c 100644
--- a/loader/preloader.c
+++ b/loader/preloader.c
@@ -847,6 +847,12 @@
         start = end = NULL;
     }
 
+    /* check for overlap with low memory area */
+    if ((char *)end <= (char *)preload_info[0].addr + preload_info[0].size)
+        start = end = NULL;
+    else if ((char *)start < (char *)preload_info[0].addr + preload_info[0].size)
+        start = (char *)preload_info[0].addr + preload_info[0].size;
+
     /* entry 2 is for the PE exe */
     preload_info[2].addr = start;
     preload_info[2].size = (char *)end - (char *)start;