ole32: Hold a lock when checking is spy is already registered.

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

ole32: Hold a lock when checking is spy is already registered.
7c0b1b62 · Nikolay Sivov · Alexandre Julliard · cef4c7dc · 7c0b1b62
Commit 7c0b1b62 authored Mar 04, 2016 by Nikolay Sivov Committed by Alexandre Julliard Mar 04, 2016
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
@@ -467,11 +467,12 @@ HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy)
 	TRACE("%p\n", pMallocSpy);

 	if(!pMallocSpy) return E_INVALIDARG;
-	if(Malloc32.pSpy) return CO_E_OBJISREG;

        EnterCriticalSection(&IMalloc32_SpyCS);

-	if (SUCCEEDED(IMallocSpy_QueryInterface(pMallocSpy, &IID_IMallocSpy, (void**)&pSpy))) {
+	if (Malloc32.pSpy)
+	    hres = CO_E_OBJISREG;
+	else if (SUCCEEDED(IMallocSpy_QueryInterface(pMallocSpy, &IID_IMallocSpy, (void**)&pSpy))) {
 	    Malloc32.pSpy = pSpy;
 	    hres = S_OK;
 	}