ntdll: Stop search on mmap() error in try_map_free_area().

The anon mmap errors do not depend on start address hint. Ignoring them makes the search take incredible time until it fails. Signed-off-by: Paul Gofman <pgofman@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Stop search on mmap() error in try_map_free_area().
5498ebd8 · Paul Gofman · Alexandre Julliard · 2b2341cb · 5498ebd8
Commit 5498ebd8 authored Jul 10, 2020 by Paul Gofman Committed by Alexandre Julliard Jul 13, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

virtual.c dlls/ntdll/unix/virtual.c +8 -2

No files found.
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -1009,8 +1009,14 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
            return start;
        TRACE( "Found free area is already mapped, start %p.\n", start );

-        if (ptr != (void *)-1)
-            munmap( ptr, size );
+        if (ptr == (void *)-1)
+        {
+            ERR( "wine_anon_mmap() error %s, range %p-%p, unix_prot %#x.\n",
+                    strerror(errno), start, (char *)start + size, unix_prot );
+            return NULL;
+        }
+
+        munmap( ptr, size );

        if ((step > 0 && (char *)end - (char *)start < step) ||
            (step < 0 && (char *)start - (char *)base < -step) ||