Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-07 01:01:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mike Kaply <mkaply@us.ibm.com> pointed out a malloc(0) bug as well as a free(null).

Browse Source 
a=brendan@mozilla.org
This commit is contained in:
dougt%netscape.com 2000-07-06 00:22:17 +00:00
parent 24d247088f
commit 789492867e
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xpcom/proxy/src/nsProxyEvent.cpp
View File

@ -67,7 +67,6 @@ nsProxyObjectCallInfo::nsProxyObjectCallInfo( nsProxyObject* owner,
{
NS_ASSERTION(owner, "No nsProxyObject!");
NS_ASSERTION(methodInfo, "No nsXPTMethodInfo!");
NS_ASSERTION(parameterList, "No parameterList!");
NS_ASSERTION(event, "No PLEvent!");
mCompleted = 0;
@ -343,20 +342,22 @@ nsProxyObject::PostAndWait(nsProxyObjectCallInfo *proxyInfo)
nsresult
nsProxyObject::convertMiniVariantToVariant(nsXPTMethodInfo *methodInfo, nsXPTCMiniVariant * params, nsXPTCVariant **fullParam, uint8 *paramCount)
nsProxyObject::convertMiniVariantToVariant(nsXPTMethodInfo *methodInfo, nsXPTCMiniVariant * params, nsXPTCVariant **fullParam, uint8 *outParamCount)
{
uint8 pCount = methodInfo->GetParamCount();
uint8 paramCount = methodInfo->GetParamCount();
*outParamCount = paramCount;
*fullParam = nsnull;
*fullParam = (nsXPTCVariant*)malloc(sizeof(nsXPTCVariant) * pCount);
if (!paramCount) return NS_OK;
*fullParam = (nsXPTCVariant*)malloc(sizeof(nsXPTCVariant) * paramCount);
if (*fullParam == nsnull)
return NS_ERROR_OUT_OF_MEMORY;
for (int i = 0; i < pCount; i++)
for (int i = 0; i < paramCount; i++)
(*fullParam)[i].Init(params[i], methodInfo->GetParam(i).GetType());
*paramCount = pCount;
return NS_OK;
}
@ -407,7 +408,8 @@ nsProxyObject::Post( PRUint32 methodIndex, nsXPTMethodInfo *methodInfo, nsXPTCMi
if (proxyInfo == nsnull)
{
delete event;
free(fullParam); // allocated with malloc
if (fullParam)
free(fullParam); // allocated with malloc
return NS_ERROR_OUT_OF_MEMORY;
}