[PATCH 2/3] ole32: Improve thread safety in DidAlloc().
Nikolay Sivov
nsivov at codeweavers.com
Thu Apr 16 14:01:49 CDT 2020
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
If spy is set after initial null check, it will touch critical section it didn't acquire.
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);
--
2.25.1
More information about the wine-devel
mailing list