Nikolay Sivov : ole32: Improve thread safety in DidAlloc().

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Thu Apr 16 22:01:49 2020 +0300

ole32: Improve thread safety in DidAlloc().

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

---

 dlls/ole32/ifs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c
index e747cfc0fe..410691b2a8 100644
--- 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);