Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bad array addressing in GetIIDForMethodParam when passed a nsXPTCVariant

Browse Source 
array.  Thanks to Javier Pedemonte for discovering this bug.

Not part of the default build.
This commit is contained in:
darin%meer.net 2004-06-23 23:22:56 +00:00
parent 865bfc75b2
commit 2ba5715b6a
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp
View File

@ -1078,7 +1078,7 @@ DConnectStub::CallMethod(PRUint16 aMethodIndex,
{
nsID iid;
rv = gDConnect->GetIIDForMethodParam(mIInfo, aInfo, paramInfo, type,
aMethodIndex, i, aParams, iid);
aMethodIndex, i, aParams, PR_FALSE, iid);
if (NS_SUCCEEDED(rv))
rv = SerializeInterfaceParam(writer, mPeerID, iid, type, aParams[i], wrappers);
}
@ -1154,7 +1154,7 @@ DConnectStub::CallMethod(PRUint16 aMethodIndex,
nsID iid;
rv = gDConnect->GetIIDForMethodParam(mIInfo, aInfo, paramInfo, type,
aMethodIndex, i, aParams, iid);
aMethodIndex, i, aParams, PR_FALSE, iid);
if (NS_SUCCEEDED(rv))
{
DConnectStub *stub;
@ -1323,6 +1323,7 @@ ipcDConnectService::GetIIDForMethodParam(nsIInterfaceInfo *iinfo,
PRUint16 methodIndex,
PRUint8 paramIndex,
nsXPTCMiniVariant *dispatchParams,
PRBool isFullVariantArray,
nsID &result)
{
PRUint8 argnum, tag = type.TagPart();
@ -1345,7 +1346,11 @@ ipcDConnectService::GetIIDForMethodParam(nsIInterfaceInfo *iinfo,
if (!arg_type.IsPointer() || arg_type.TagPart() != nsXPTType::T_IID)
return NS_ERROR_UNEXPECTED;
nsID *p = (nsID *) dispatchParams[argnum].val.p;
nsID *p;
if (isFullVariantArray)
p = (nsID *) ((nsXPTCVariant *) dispatchParams)[argnum].val.p;
else
p = (nsID *) dispatchParams[argnum].val.p;
if (!p)
return NS_ERROR_UNEXPECTED;
@ -1672,7 +1677,7 @@ ipcDConnectService::OnInvoke(PRUint32 peer, const DConnectInvoke *invoke, PRUint
nsID iid;
rv = GetIIDForMethodParam(iinfo, methodInfo, paramInfo, type,
invoke->method_index, i, params, iid);
invoke->method_index, i, params, PR_TRUE, iid);
if (NS_SUCCEEDED(rv))
{
DConnectStub *stub;
@ -1730,7 +1735,7 @@ end:
{
nsID iid;
rv = GetIIDForMethodParam(iinfo, methodInfo, paramInfo, type,
invoke->method_index, i, params, iid);
invoke->method_index, i, params, PR_TRUE, iid);
if (NS_SUCCEEDED(rv))
rv = SerializeInterfaceParam(writer, peer, iid, type, params[i], wrappers);
}

1
ipc/ipcd/extensions/dconnect/src/ipcDConnectService.h
View File

@ -68,6 +68,7 @@ public:
PRUint16 methodIndex,
PRUint8 paramIndex,
nsXPTCMiniVariant *dispatchParams,
PRBool isFullVariantArray,
nsID &result);
NS_HIDDEN_(nsresult) StoreInstance(DConnectInstance *);