[PATCH 0/1] MR3258: wow64win: Fix NULL buffer handling in wow64_NtUserBuildHimcList.

[Jacek Caban (＠jacek)]

Fixes win32u tests on wow64.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3258

[PATCH 1/1] wow64win: Fix NULL buffer handling in wow64_NtUserBuildHimcList.

[Jacek Caban]

From: Jacek Caban <jacek(a)codeweavers.com>

Fixes win32u tests on wow64.
---
 dlls/wow64win/user.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c
index 73854225b7f..8e2853ca0b5 100644
--- a/dlls/wow64win/user.c
+++ b/dlls/wow64win/user.c
@@ -1186,11 +1186,12 @@ NTSTATUS WINAPI wow64_NtUserBuildHimcList( UINT *args )
     UINT32 *buffer32 = get_ptr( &args );
     UINT *size = get_ptr( &args );
 
-    HIMC *buffer;
+    HIMC *buffer = NULL;
     ULONG i;
     NTSTATUS status;
 
-    if (!(buffer = Wow64AllocateTemp( count * sizeof(*buffer) ))) return STATUS_NO_MEMORY;
+    if (buffer32 && !(buffer = Wow64AllocateTemp( count * sizeof(*buffer) )))
+        return STATUS_NO_MEMORY;
 
     if ((status = NtUserBuildHimcList( thread_id, count, buffer, size ))) return status;
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3258