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

oleaut32: Introduce a new helper function, TLB_FreeCustData, for freeing custom data. 

Fix memory leaks caused by the variable and interface custom data not 
being freed properly.
This commit is contained in:
Rob Shearman 2007-11-27 19:16:35 +00:00 committed by Alexandre Julliard
parent aaa6c4007f
commit e68371040f
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/oleaut32/typelib.c
View File

@ -1421,6 +1421,19 @@ static void *TLB_CopyTypeDesc( TYPEDESC *dest, const TYPEDESC *src, void *buffer
return buffer; return buffer;
} }
/* free custom data allocated by MSFT_CustData */
static inline void TLB_FreeCustData(TLBCustData *pCustData)
{
TLBCustData *pCustDataNext;
for (; pCustData; pCustData = pCustDataNext)
{
VariantClear(&pCustData->data);
pCustDataNext = pCustData->next;
TLB_Free(pCustData);
}
}
/********************************************************************** /**********************************************************************
* *
* Functions for reading MSFT typelibs (those created by CreateTypeLib2) * Functions for reading MSFT typelibs (those created by CreateTypeLib2)
@ -4474,7 +4487,6 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface)
TLBFuncDesc *pFInfo, *pFInfoNext; TLBFuncDesc *pFInfo, *pFInfoNext;
TLBVarDesc *pVInfo, *pVInfoNext; TLBVarDesc *pVInfo, *pVInfoNext;
TLBImplType *pImpl, *pImplNext; TLBImplType *pImpl, *pImplNext;
TLBCustData *pCustData, *pCustDataNext;
TRACE("destroying ITypeInfo(%p)\n",This); TRACE("destroying ITypeInfo(%p)\n",This);
@ -4514,13 +4526,7 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface)
} }
TLB_Free(pFInfo->funcdesc.lprgelemdescParam); TLB_Free(pFInfo->funcdesc.lprgelemdescParam);
TLB_Free(pFInfo->pParamDesc); TLB_Free(pFInfo->pParamDesc);
for (pCustData = pFInfo->pCustData; pCustData; pCustData = pCustDataNext) TLB_FreeCustData(pFInfo->pCustData);
{
VariantClear(&pCustData->data);
pCustDataNext = pCustData->next;
TLB_Free(pCustData);
}
if (HIWORD(pFInfo->Entry) != 0 && pFInfo->Entry != (BSTR)-1) if (HIWORD(pFInfo->Entry) != 0 && pFInfo->Entry != (BSTR)-1)
SysFreeString(pFInfo->Entry); SysFreeString(pFInfo->Entry);
SysFreeString(pFInfo->HelpString); SysFreeString(pFInfo->HelpString);
@ -4536,23 +4542,18 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface)
VariantClear(pVInfo->vardesc.u.lpvarValue); VariantClear(pVInfo->vardesc.u.lpvarValue);
TLB_Free(pVInfo->vardesc.u.lpvarValue); TLB_Free(pVInfo->vardesc.u.lpvarValue);
} }
TLB_FreeCustData(pVInfo->pCustData);
SysFreeString(pVInfo->Name); SysFreeString(pVInfo->Name);
pVInfoNext = pVInfo->next; pVInfoNext = pVInfo->next;
TLB_Free(pVInfo); TLB_Free(pVInfo);
} }
for(pImpl = This->impltypelist; pImpl; pImpl = pImplNext) for(pImpl = This->impltypelist; pImpl; pImpl = pImplNext)
{ {
for (pCustData = pImpl->pCustData; pCustData; pCustData = pCustDataNext) TLB_FreeCustData(pImpl->pCustData);
{
VariantClear(&pCustData->data);
pCustDataNext = pCustData->next;
TLB_Free(pCustData);
}
pImplNext = pImpl->next; pImplNext = pImpl->next;
TLB_Free(pImpl); TLB_Free(pImpl);
} }
TLB_Free(This->pCustData); TLB_FreeCustData(This->pCustData);
finish_free: finish_free:
if (This->next) if (This->next)