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.

Avoid infinite loop when doing a typelib marshalled
4d49d8ca · Mike Hearn · Alexandre Julliard · 80380eaa · 4d49d8ca
Commit 4d49d8ca authored Feb 21, 2005 by Mike Hearn Committed by Alexandre Julliard Feb 21, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 5 deletions

marshal.c dlls/ole32/marshal.c +13 -5

No files found.
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -1416,11 +1416,19 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *pStream, REFIID riid, LPVOID *ppv)

    if (hr == S_OK)
    {
-        hr = IUnknown_QueryInterface(object, &iid, ppv);
-        if (hr)
-            ERR("Couldn't query for interface %s, hr = 0x%08lx\n",
-                debugstr_guid(riid), hr);
-        IUnknown_Release(object);
+        if (!IsEqualIID(riid, &iid))
+        {
+            TRACE("requested interface != marshalled interface, additional QI needed\n");
+            hr = IUnknown_QueryInterface(object, &iid, ppv);
+            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);