Rémi Bernon : kernelbase: Workaround Local(Alloc|Free) invalid access warnings.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1e110562565bca8fc1c5d351b96f3cd9a148d030
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1e110562565bca8fc1c5d351b...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Fri May 20 22:54:03 2022 +0200

kernelbase: Workaround Local(Alloc|Free) invalid access warnings.

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>

---

 dlls/kernelbase/memory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c
index 416d7b52a16..b89ab04a38f 100644
--- a/dlls/kernelbase/memory.c
+++ b/dlls/kernelbase/memory.c
@@ -712,7 +712,7 @@ static struct kernelbase_global_data global_data = {0};
 
 static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle )
 {
-    struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr );
+    struct mem_entry *mem = CONTAINING_RECORD( *(volatile HANDLE *)&handle, struct mem_entry, ptr );
     struct kernelbase_global_data *data = &global_data;
     if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1)) != sizeof(void *)) return NULL;
     if (mem < data->mem_entries || mem >= data->mem_entries_end) return NULL;
@@ -831,7 +831,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalAlloc( UINT flags, SIZE_T size )
     return handle;
 
 failed:
-    if (mem) LocalFree( handle );
+    if (mem) LocalFree( *(volatile HANDLE *)&handle );
     SetLastError( ERROR_NOT_ENOUGH_MEMORY );
     return 0;
 }