[PATCH 1/2] qasf/dmowrapper: Don't crash in ::Stop when DMO wrapper is not initialized.
Anton Baskanov
baskanov at gmail.com
Thu Jun 25 10:21:09 CDT 2020
Signed-off-by: Anton Baskanov <baskanov at gmail.com>
---
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);
--
2.17.1
More information about the wine-devel
mailing list