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

Avoid infinite loop when doing a typelib marshalled 

IUnknown::QueryInterface by only doing an extra QI if requested IID is
not equal to marshalled IID.
This commit is contained in:
Mike Hearn 2005-02-21 18:35:07 +00:00 committed by Alexandre Julliard
parent 80380eaa32
commit 4d49d8ca36
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/ole32/marshal.c
View File

@ -1416,11 +1416,19 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *pStream, REFIID riid, LPVOID *ppv)
if (hr == S_OK) if (hr == S_OK)
{ {
hr = IUnknown_QueryInterface(object, &iid, ppv); if (!IsEqualIID(riid, &iid))
if (hr) {
ERR("Couldn't query for interface %s, hr = 0x%08lx\n", TRACE("requested interface != marshalled interface, additional QI needed\n");
debugstr_guid(riid), hr); hr = IUnknown_QueryInterface(object, &iid, ppv);
IUnknown_Release(object); if (hr)
ERR("Couldn't query for interface %s, hr = 0x%08lx\n",
debugstr_guid(riid), hr);
IUnknown_Release(object);
}
else
{
*ppv = object;
}
} }
IMarshal_Release(pMarshal); IMarshal_Release(pMarshal);