ole32: Improve locking safety in IMalloc::HeapMinimize().

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

ole32: Improve locking safety in IMalloc::HeapMinimize().
1039a775 · Nikolay Sivov · Alexandre Julliard · da5903e7 · 1039a775
Commit 1039a775 authored Apr 20, 2020 by Nikolay Sivov Committed by Alexandre Julliard Apr 20, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 9 deletions

ifs.c dlls/ole32/ifs.c +14 -9

No files found.
--- a/dlls/ole32/ifs.c
+++ b/dlls/ole32/ifs.c
@@ -363,17 +363,22 @@ static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *mem)
 */
 static void WINAPI IMalloc_fnHeapMinimize(IMalloc *iface)
 {
-	TRACE("()\n");
+    BOOL spy_active = FALSE;

-	if(Malloc32.pSpy) {
-            EnterCriticalSection(&IMalloc32_SpyCS);
-	    IMallocSpy_PreHeapMinimize(Malloc32.pSpy);
-	}
+    TRACE("()\n");

-	if(Malloc32.pSpy) {
-	    IMallocSpy_PostHeapMinimize(Malloc32.pSpy);
-            LeaveCriticalSection(&IMalloc32_SpyCS);
-	}
+    if (Malloc32.pSpy)
+    {
+        EnterCriticalSection(&IMalloc32_SpyCS);
+        spy_active = TRUE;
+        IMallocSpy_PreHeapMinimize(Malloc32.pSpy);
+    }
+
+    if (spy_active)
+    {
+        IMallocSpy_PostHeapMinimize(Malloc32.pSpy);
+        LeaveCriticalSection(&IMalloc32_SpyCS);
+    }
 }

 static const IMallocVtbl VT_IMalloc32 =