mf: Fix timer instance leak on error path in SetTimer().

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mf: Fix timer instance leak on error path in SetTimer().
35242aa4 · Nikolay Sivov · Alexandre Julliard · 1f90b33d · 35242aa4
Commit 35242aa4 authored May 06, 2020 by Nikolay Sivov Committed by Alexandre Julliard May 06, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

session.c dlls/mf/session.c +9 -5

No files found.
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -4093,15 +4093,19 @@ static HRESULT WINAPI present_clock_timer_SetTimer(IMFTimer *iface, DWORD flags,
        hr = MF_S_CLOCK_STOPPED;

    if (SUCCEEDED(hr))
+    {
        list_add_tail(&clock->timers, &clock_timer->entry);
+        if (cancel_key)
+        {
+            *cancel_key = &clock_timer->IUnknown_iface;
+            IUnknown_AddRef(*cancel_key);
+        }
+    }

    LeaveCriticalSection(&clock->cs);

-    if (SUCCEEDED(hr) && cancel_key)
-    {
-        *cancel_key = &clock_timer->IUnknown_iface;
-        IUnknown_AddRef(*cancel_key);
-    }
+    if (FAILED(hr))
+        IUnknown_Release(&clock_timer->IUnknown_iface);

    return hr;
 }