Anton Baskanov : qasf/dmowrapper: Don't crash in ::Stop when DMO wrapper is not initialized.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3667754aa2a5fb42ac01aa3820436a2d04e6089f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3667754aa2a5fb42ac01aa3820436a2d04e6089f

Author: Anton Baskanov <baskanov at gmail.com>
Date:   Thu Jun 25 22:21:09 2020 +0700

qasf/dmowrapper: Don't crash in ::Stop when DMO wrapper is not initialized.

Signed-off-by: Anton Baskanov <baskanov at gmail.com>
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/qasf/dmowrapper.c       |  3 +++
 dlls/qasf/tests/dmowrapper.c | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c
index e2d4063828..8cf4404ece 100644
--- a/dlls/qasf/dmowrapper.c
+++ b/dlls/qasf/dmowrapper.c
@@ -673,6 +673,9 @@ static HRESULT dmo_wrapper_cleanup_stream(struct strmbase_filter *iface)
     IMediaObject *dmo;
     DWORD i;
 
+    if (!filter->dmo)
+        return E_FAIL;
+
     IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo);
 
     for (i = 0; i < filter->source_count; ++i)
diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c
index 72c05ee49c..f76c0c3d9d 100644
--- a/dlls/qasf/tests/dmowrapper.c
+++ b/dlls/qasf/tests/dmowrapper.c
@@ -1995,6 +1995,23 @@ static void test_connect_pin(void)
     ok(!ref, "Got outstanding refcount %d.\n", ref);
 }
 
+static void test_uninitialized(void)
+{
+    IBaseFilter *filter = NULL;
+    HRESULT hr;
+    ULONG ref;
+
+    hr = CoCreateInstance(&CLSID_DMOWrapperFilter, NULL,
+            CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter);
+    ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+    hr = IBaseFilter_Stop(filter);
+    ok(hr == E_FAIL, "Got hr %#x.\n", hr);
+
+    ref = IBaseFilter_Release(filter);
+    ok(!ref, "Got outstanding refcount %d.\n", ref);
+}
+
 START_TEST(dmowrapper)
 {
     DWORD cookie;
@@ -2022,6 +2039,7 @@ START_TEST(dmowrapper)
     test_media_types();
     test_enum_media_types();
     test_connect_pin();
+    test_uninitialized();
 
     CoRevokeClassObject(cookie);
     DMOUnregister(&testdmo_clsid, &DMOCATEGORY_AUDIO_DECODER);