Module: wine Branch: stable Commit: 90d397109fac1d1503a677dd86fecc3bb8b5778f URL: https://source.winehq.org/git/wine.git/?a=commit;h=90d397109fac1d1503a677dd8...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Oct 9 10:44:29 2017 +0200
ntdll: Ignore the preload start address if it is zero.
Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 0374d86c571724b7100308047653d8b300072afb) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/ntdll/virtual.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e225639..5a50312 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1327,7 +1327,8 @@ void virtual_init(void) preload_reserve_start = (void *)start; preload_reserve_end = (void *)end; /* some apps start inside the DOS area */ - address_space_start = min( address_space_start, preload_reserve_start ); + if (preload_reserve_start) + address_space_start = min( address_space_start, preload_reserve_start ); } }