ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-04-20 10:59:19 +03:00 committed by Alexandre Julliard
parent ed53127580
commit da5903e7d1
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/ole32/ifs.c
View File

@ -254,35 +254,39 @@ static void * WINAPI IMalloc_fnRealloc(IMalloc *iface, void *pv, SIZE_T cb)
/****************************************************************************** /******************************************************************************
* IMalloc32_Free [VTABLE] * IMalloc32_Free [VTABLE]
*/ */
static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) static void WINAPI IMalloc_fnFree(IMalloc *iface, void *mem)
{ {
BOOL fSpyed = FALSE; BOOL spyed_block = FALSE, spy_active = FALSE;
TRACE("(%p)\n",pv); TRACE("(%p)\n", mem);
if(!pv) if (!mem)
return; return;
if(Malloc32.pSpy) { if (Malloc32.pSpy)
EnterCriticalSection(&IMalloc32_SpyCS); {
fSpyed = mallocspy_remove_spyed_memory(pv); EnterCriticalSection(&IMalloc32_SpyCS);
pv = IMallocSpy_PreFree(Malloc32.pSpy, pv, fSpyed); spyed_block = mallocspy_remove_spyed_memory(mem);
} spy_active = TRUE;
mem = IMallocSpy_PreFree(Malloc32.pSpy, mem, spyed_block);
}
HeapFree(GetProcessHeap(),0,pv); HeapFree(GetProcessHeap(), 0, mem);
if(Malloc32.pSpy) { if (spy_active)
IMallocSpy_PostFree(Malloc32.pSpy, fSpyed); {
IMallocSpy_PostFree(Malloc32.pSpy, spyed_block);
/* check if can release the spy */ /* check if can release the spy */
if(Malloc32.SpyReleasePending && !Malloc32.SpyedAllocationsLeft) { if (Malloc32.SpyReleasePending && !Malloc32.SpyedAllocationsLeft)
IMallocSpy_Release(Malloc32.pSpy); {
Malloc32.SpyReleasePending = FALSE; IMallocSpy_Release(Malloc32.pSpy);
Malloc32.pSpy = NULL; Malloc32.SpyReleasePending = FALSE;
} Malloc32.pSpy = NULL;
LeaveCriticalSection(&IMalloc32_SpyCS);
} }
LeaveCriticalSection(&IMalloc32_SpyCS);
}
} }
/****************************************************************************** /******************************************************************************