ntdll: Only free reserved memory for DYNAMIC_BASE binaries.

To avoid triggering more pointer-truncation bugs in applications.

ntdll: Only free reserved memory for DYNAMIC_BASE binaries.
7a7b8288 · Alexandre Julliard · 0a5f7a71 · 7a7b8288
Commit 7a7b8288 authored Dec 14, 2023 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

No files found.
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -4397,7 +4397,8 @@ void virtual_set_large_address_space(void)
        if (is_wow64())
            user_space_wow_limit = ((main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) ? limit_4g : limit_2g) - 1;
 #ifndef __APPLE__  /* don't free the zerofill section on macOS */
-        else if (main_image_info.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA)
+        else if ((main_image_info.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA) &&
+                 (main_image_info.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE))
            free_reserved_memory( 0, (char *)0x7ffe0000 );
 #endif
    }