oleaut32: Lock ITypeLib2 interface reference count behind the typelib cache…

oleaut32: Lock ITypeLib2 interface reference count behind the typelib cache critical section on Release. This prevents an ITypeLib2 interface being returned from the typelib cache that is in the middle of being destroyed. Signed-off-by: Connor McAdams <cmcadams@codeweavers.com>

oleaut32: Lock ITypeLib2 interface reference count behind the typelib cache…
3e84b493 · Connor McAdams · Alexandre Julliard · eb8eccbe · 3e84b493
Commit 3e84b493 authored Nov 08, 2023 by Connor McAdams Committed by Alexandre Julliard Nov 10, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

typelib.c dlls/oleaut32/typelib.c +5 -4

No files found.
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -4712,7 +4712,10 @@ static ULONG WINAPI ITypeLib2_fnAddRef( ITypeLib2 *iface)
 static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface)
 {
    ITypeLibImpl *This = impl_from_ITypeLib2(iface);
-    ULONG ref = InterlockedDecrement(&This->ref);
+    ULONG ref;
+
+    EnterCriticalSection(&cache_section);
+    ref = InterlockedDecrement(&This->ref);

    TRACE("%p, refcount %lu.\n", iface, ref);

@@ -4728,10 +4731,8 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface)
      if(This->path)
      {
          TRACE("removing from cache list\n");
-          EnterCriticalSection(&cache_section);
          if(This->entry.next)
              list_remove(&This->entry);
-          LeaveCriticalSection(&cache_section);
          free(This->path);
      }
      TRACE(" destroying ITypeLib(%p)\n",This);
@@ -4783,9 +4784,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface)
      }
      free(This->typeinfos);
      free(This);
-      return 0;
    }

+    LeaveCriticalSection(&cache_section);
    return ref;
 }