ole32: Improve thread safety in DidAlloc().

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ole32: Improve thread safety in DidAlloc().
1e3bc9f3 · Nikolay Sivov · Alexandre Julliard · 08f4b6ee · 1e3bc9f3
Commit 1e3bc9f3 authored Apr 16, 2020 by Nikolay Sivov Committed by Alexandre Julliard Apr 17, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

ifs.c dlls/ole32/ifs.c +3 -2

No files found.
--- a/dlls/ole32/ifs.c
+++ b/dlls/ole32/ifs.c
@@ -323,7 +323,7 @@ static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv)
 */
 static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *mem)
 {
-    BOOL spyed_block = FALSE;
+    BOOL spyed_block = FALSE, spy_active = FALSE;
    int did_alloc;

    TRACE("(%p)\n", mem);
@@ -335,12 +335,13 @@ static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *mem)
    {
        EnterCriticalSection(&IMalloc32_SpyCS);
        spyed_block = !!mallocspy_is_allocation_spyed(mem);
+        spy_active = TRUE;
        mem = IMallocSpy_PreDidAlloc(Malloc32.pSpy, mem, spyed_block);
    }

    did_alloc = HeapValidate(GetProcessHeap(), 0, mem);

-    if (Malloc32.pSpy)
+    if (spy_active)
    {
        did_alloc = IMallocSpy_PostDidAlloc(Malloc32.pSpy, mem, spyed_block, did_alloc);
        LeaveCriticalSection(&IMalloc32_SpyCS);