ole32: Release iobject and the IRpcStubBuffer object no matter which code path we take.

Otherwise we would leak a reference for both of these if the ifstub was already created. Fix the FIXME in the code by releasing the stub manager if necessary.

ole32: Release iobject and the IRpcStubBuffer object no matter which code path we take.
723592cf · Rob Shearman · Alexandre Julliard · 65f1d6a3 · 723592cf
Commit 723592cf authored Feb 06, 2007 by Rob Shearman Committed by Alexandre Julliard Feb 06, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 10 deletions

marshal.c dlls/ole32/marshal.c +11 -10

No files found.
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -155,17 +155,18 @@ HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnkno
    /* make sure ifstub that we are creating is unique */
    ifstub = stub_manager_find_ifstub(manager, riid, mshlflags);
    if (!ifstub)
-    {
        ifstub = stub_manager_new_ifstub(manager, stub, iobject, riid, mshlflags);
-        IUnknown_Release(iobject);
-        if (stub) IRpcStubBuffer_Release(stub);
-        if (!ifstub)
-        {
-            stub_manager_int_release(manager);
-            /* FIXME: should we do another release to completely destroy the
-             * stub manager? */
-            return E_OUTOFMEMORY;
-        }
+
+    if (stub) IRpcStubBuffer_Release(stub);
+    IUnknown_Release(iobject);
+
+    if (!ifstub)
+    {
+        stub_manager_int_release(manager);
+        /* destroy the stub manager if it has no ifstubs by releasing
+         * zero external references */
+        stub_manager_ext_release(manager, 0, TRUE);
+        return E_OUTOFMEMORY;
    }

    if (!tablemarshal)