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

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Apr 20 10:59:20 2020 +0300

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

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

---

 dlls/ole32/ifs.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c
index f1dae0c956..96977fc751 100644
--- 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 =