ole32: Leave the RunningObjectTable Critical Section before umarshalling object.

Sometimes umarshalling an object from the RunningObjectTable can cause the routine to access the table back inside another thread, causing a deadlock. Visual Studio 2019 is an example of this behaviour. Signed-off-by: Lorenzo Ferrillo <lorenzofersteam@live.it>

ole32: Leave the RunningObjectTable Critical Section before umarshalling object.
7860dd06 · Lorenzo Ferrillo · Alexandre Julliard · 50da8767 · 7860dd06
Commit 7860dd06 authored Sep 10, 2023 by Lorenzo Ferrillo Committed by Alexandre Julliard Sep 11, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

moniker.c dlls/ole32/moniker.c +2 -1

No files found.
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -541,13 +541,14 @@ RunningObjectTableImpl_GetObject( IRunningObjectTable* iface,
        {
            IStream *pStream;
            hr = create_stream_on_mip_ro(rot_entry->object, &pStream);
+            LeaveCriticalSection(&This->lock);
+
            if (hr == S_OK)
            {
                hr = CoUnmarshalInterface(pStream, &IID_IUnknown, (void **)ppunkObject);
                IStream_Release(pStream);
            }

-            LeaveCriticalSection(&This->lock);
            HeapFree(GetProcessHeap(), 0, moniker_data);

            return hr;