[PATCH v10 3/4] ntdll: Set old_prot to PAGE_NOACCESS in NtProtectVirtualMemory() if the range is not mapped or committed.

[Kareem Aladli]

From: Kareem Aladli

---
 dlls/ntdll/unix/virtual.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index e733e3ffdd6..eb22cfa40df 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -5365,11 +5365,15 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T
         status = server_queue_process_apc( process, &call, &result );
         if (status != STATUS_SUCCESS) return status;

-        if (result.virtual_protect.status == STATUS_SUCCESS)
+        switch (result.virtual_protect.status)
         {
+        case STATUS_SUCCESS:
             *addr_ptr = wine_server_get_ptr( result.virtual_protect.addr );
             *size_ptr = result.virtual_protect.size;
+        case STATUS_NOT_COMMITTED:
+        case STATUS_INVALID_PARAMETER:
             *old_prot = result.virtual_protect.prot;
+            break;
         }
         return result.virtual_protect.status;
     }
@@ -5389,9 +5393,17 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T
             old = get_win32_prot( vprot, view->protect );
             status = set_protection( view, base, size, new_prot );
         }
-        else status = STATUS_NOT_COMMITTED;
+        else
+        {
+            status = STATUS_NOT_COMMITTED;
+            *old_prot = PAGE_NOACCESS;
+        }
+    }
+    else
+    {
+        status = STATUS_INVALID_PARAMETER;
+        *old_prot = PAGE_NOACCESS;
     }
-    else status = STATUS_INVALID_PARAMETER;

if (!status) VIRTUAL_DEBUG_DUMP_VIEW( view );