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

ole32: Fix memory leaks in CompositeMonikerImpl_Construct. 

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alex Henrie 2016-04-13 22:56:49 -06:00 committed by Alexandre Julliard
parent b7f1839583
commit dddfd46934
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/ole32/compositemoniker.c
View File

@ -1755,6 +1755,7 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike
IMoniker *tempMk; IMoniker *tempMk;
HRESULT res; HRESULT res;
CompositeMonikerImpl *This; CompositeMonikerImpl *This;
int i;
This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
@ -1800,12 +1801,14 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike
if (++This->tabLastIndex==This->tabSize){ if (++This->tabLastIndex==This->tabSize){
LPVOID tab_moniker = This->tabMoniker; IMoniker **tab_moniker = This->tabMoniker;
This->tabSize+=BLOCK_TAB_SIZE; This->tabSize+=BLOCK_TAB_SIZE;
This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0])); This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0]));
if (This->tabMoniker==NULL){ if (This->tabMoniker==NULL){
for (i = 0; i < This->tabLastIndex; i++)
IMoniker_Release(tab_moniker[i]);
HeapFree(GetProcessHeap(), 0, tab_moniker); HeapFree(GetProcessHeap(), 0, tab_moniker);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -1848,18 +1851,25 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike
IMoniker_Release(This->tabMoniker[This->tabLastIndex-1]); IMoniker_Release(This->tabMoniker[This->tabLastIndex-1]);
This->tabMoniker[This->tabLastIndex-1]=tempMk; This->tabMoniker[This->tabLastIndex-1]=tempMk;
} else } else{
for (i = 0; i < This->tabLastIndex; i++)
IMoniker_Release(This->tabMoniker[i]);
HeapFree(GetProcessHeap(), 0, This->tabMoniker);
HeapFree(GetProcessHeap(), 0, This);
return res; return res;
}
/* resize tabMoniker if needed */ /* resize tabMoniker if needed */
if (This->tabLastIndex==This->tabSize){ if (This->tabLastIndex==This->tabSize){
LPVOID tab_moniker = This->tabMoniker; IMoniker **tab_moniker = This->tabMoniker;
This->tabSize+=BLOCK_TAB_SIZE; This->tabSize+=BLOCK_TAB_SIZE;
This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker));
if (This->tabMoniker==NULL){ if (This->tabMoniker==NULL){
for (i = 0; i < This->tabLastIndex; i++)
IMoniker_Release(tab_moniker[i]);
HeapFree(GetProcessHeap(), 0, tab_moniker); HeapFree(GetProcessHeap(), 0, tab_moniker);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -1896,13 +1906,15 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike
} }
if (This->tabLastIndex==This->tabSize){ if (This->tabLastIndex==This->tabSize){
LPVOID tab_moniker = This->tabMoniker; IMoniker **tab_moniker = This->tabMoniker;
This->tabSize+=BLOCK_TAB_SIZE; This->tabSize+=BLOCK_TAB_SIZE;
This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0])); This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0]));
if (This->tabMoniker==NULL){ if (This->tabMoniker==NULL){
for (i = 0; i < This->tabLastIndex; i++)
IMoniker_Release(tab_moniker[i]);
HeapFree(GetProcessHeap(), 0, tab_moniker); HeapFree(GetProcessHeap(), 0, tab_moniker);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;