Rémi Bernon : winegstreamer: Release callback and context in async_reader_close.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8f482eba139b89805e34a2d2985109f17f625352
URL:    https://gitlab.winehq.org/wine/wine/-/commit/8f482eba139b89805e34a2d2985109f...

Author: Rémi Bernon 
Date:   Mon Aug 22 19:21:01 2022 +0200

winegstreamer: Release callback and context in async_reader_close.

---

dlls/winegstreamer/wm_asyncreader.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index bd7e58713f4..2a2b7310293 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -263,24 +263,29 @@ static void async_reader_close(struct async_reader *reader)
         list_remove(&op->entry);
         free(op);
     }
+
+    if (reader->callback)
+        IWMReaderCallback_Release(reader->callback);
+    reader->callback = NULL;
+    reader->context = NULL;
 }

static HRESULT async_reader_open(struct async_reader *reader, IWMReaderCallback *callback, void *context)
 {
+    HRESULT hr = E_OUTOFMEMORY;
+
     IWMReaderCallback_AddRef((reader->callback = callback));
     reader->context = context;

reader->running = true;
     if (!(reader->callback_thread = CreateThread(NULL, 0, async_reader_callback_thread, reader, 0, NULL)))
-    {
-        IWMReaderCallback_Release(reader->callback);
-        reader->running = false;
-        reader->callback = NULL;
-        reader->context = NULL;
-        return E_OUTOFMEMORY;
-    }
+        goto error;

return S_OK;
+
+error:
+    async_reader_close(reader);
+    return hr;
 }

static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_type type, void *context)
@@ -365,9 +370,6 @@ static HRESULT WINAPI WMReader_Close(IWMReader *iface)
     async_reader_close(reader);

hr = wm_reader_close(&reader->reader);
-    if (reader->callback)
-        IWMReaderCallback_Release(reader->callback);
-    reader->callback = NULL;

LeaveCriticalSection(&reader->reader.cs);

@@ -1693,9 +1695,6 @@ static void async_reader_destroy(struct wm_reader *iface)

wm_reader_close(&reader->reader);

-    if (reader->callback)
-        IWMReaderCallback_Release(reader->callback);
-
     wm_reader_cleanup(&reader->reader);
     free(reader);
 }