[PATCH 0/1] MR136: kernelbase: Avoid relying on the exception handler to test that handle != NULL.

[Huw Davies (＠huw)]

Fixes a regression in SlingPlayer 2 caused by commit
a76518c186ac0893ea460cd3b061096f1b05c8cc.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52127
Signed-off-by: Huw Davies <huw(a)codeweavers.com>

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

[PATCH 1/1] kernelbase: Avoid relying on the exception handler to test that handle != NULL.

[Huw Davies]

From: Huw Davies <huw(a)codeweavers.com>

Fixes a regression in SlingPlayer 2 caused by commit
a76518c186ac0893ea460cd3b061096f1b05c8cc.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52127
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
 dlls/kernelbase/memory.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c
index b89ab04a38f..9490626a40a 100644
--- a/dlls/kernelbase/memory.c
+++ b/dlls/kernelbase/memory.c
@@ -883,6 +883,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle )
 
     TRACE_(globalmem)( "handle %p\n", handle );
 
+    if (!handle) return NULL;
     if ((ret = unsafe_ptr_from_HLOCAL( handle )))
     {
         __TRY
-- 
GitLab

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