[PATCH v2 0/1] MR11740: compobj: Ensure compobj_malloc is initialized in CoGetMalloc16.

[Alex Henrie (＠alexhenrie)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=60229

--
  v2: compobj: Ensure compobj_malloc is initialized in CoGetMalloc16.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11740

[PATCH v2 1/1] compobj: Ensure compobj_malloc is initialized in CoGetMalloc16.

[Alex Henrie]

From: Alex Henrie <[e-mail]>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=60229
---
 dlls/compobj.dll16/compobj.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c
index 12a41775333..4c44b7cbadc 100644
--- a/dlls/compobj.dll16/compobj.c
+++ b/dlls/compobj.dll16/compobj.c
@@ -281,7 +281,10 @@ DWORD WINAPI CoBuildVersion16(void)
  */
 HRESULT WINAPI CoGetMalloc16(MEMCTX context, SEGPTR *malloc)
 {
-    call_IMalloc_AddRef(*malloc = compobj_malloc);
+    if (!compobj_malloc)
+        *malloc = compobj_malloc = IMalloc16_Constructor();
+    else
+        call_IMalloc_AddRef(*malloc = compobj_malloc);
     return S_OK;
 }
 
-- 
GitLab

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