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

ole32: Do not allocate spyed memory array on freeing attempts. 

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:18 +03:00 committed by Alexandre Julliard
parent 3c7fddbcae
commit ed53127580
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/ole32/ifs.c
View File

@ -128,22 +128,19 @@ static void** mallocspy_is_allocation_spyed(const void *mem)
return current;
}
static BOOL RemoveMemoryLocation(LPCVOID pMem)
static BOOL mallocspy_remove_spyed_memory(const void *mem)
{
LPVOID * Current;
void **current;
/* allocate the table if not already allocated */
if (!Malloc32.SpyedBlockTableLength && !SetSpyedBlockTableLength(0x1000))
return FALSE;
if (!Malloc32.SpyedBlockTableLength)
return FALSE;
if (!(Current = mallocspy_is_allocation_spyed(pMem)))
return FALSE;
if (!(current = mallocspy_is_allocation_spyed(mem)))
return FALSE;
/* location found */
Malloc32.SpyedAllocationsLeft--;
/*TRACE("%lu\n",Malloc32.SpyedAllocationsLeft);*/
*Current = NULL;
return TRUE;
Malloc32.SpyedAllocationsLeft--;
*current = NULL;
return TRUE;
}
/******************************************************************************
@ -216,7 +213,7 @@ static void * WINAPI IMalloc_fnRealloc(IMalloc *iface, void *pv, SIZE_T cb)
BOOL fSpyed;
EnterCriticalSection(&IMalloc32_SpyCS);
fSpyed = RemoveMemoryLocation(pv);
fSpyed = mallocspy_remove_spyed_memory(pv);
cb = IMallocSpy_PreRealloc(Malloc32.pSpy, pv, cb, &pRealMemory, fSpyed);
/* check if can release the spy */
@ -268,7 +265,7 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv)
if(Malloc32.pSpy) {
EnterCriticalSection(&IMalloc32_SpyCS);
fSpyed = RemoveMemoryLocation(pv);
fSpyed = mallocspy_remove_spyed_memory(pv);
pv = IMallocSpy_PreFree(Malloc32.pSpy, pv, fSpyed);
}