Anton Baskanov : winegstreamer: Reject incompatible input media types in MPEG layer-3 decoder.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4489c31b3dbe6ceb24ea7ff4d3796c0b44c02fce
URL:    https://gitlab.winehq.org/wine/wine/-/commit/4489c31b3dbe6ceb24ea7ff4d3796c0...

Author: Anton Baskanov 
Date:   Sun Oct  2 19:40:06 2022 +0700

winegstreamer: Reject incompatible input media types in MPEG layer-3 decoder.

Signed-off-by: Anton Baskanov

---

dlls/quartz/tests/mpeglayer3.c        | 10 +++++-----
 dlls/winegstreamer/quartz_transform.c | 12 ++++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/dlls/quartz/tests/mpeglayer3.c b/dlls/quartz/tests/mpeglayer3.c
index 8777232ccc9..17c4f74597f 100644
--- a/dlls/quartz/tests/mpeglayer3.c
+++ b/dlls/quartz/tests/mpeglayer3.c
@@ -707,23 +707,23 @@ static void test_media_types(void)
     ok(hr == S_OK, "Got hr %#lx.\n", hr);

hr = IPin_QueryAccept(pin, &mp1_mt);
-    todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
+    ok(hr == S_FALSE, "Got hr %#lx.\n", hr);

hr = IPin_QueryAccept(pin, &mp2_mt);
-    todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
+    ok(hr == S_FALSE, "Got hr %#lx.\n", hr);

hr = IPin_QueryAccept(pin, &mp3_mt0);
-    todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
+    ok(hr == S_FALSE, "Got hr %#lx.\n", hr);

mt = mp3_mt1;
     mt.majortype = GUID_NULL;
     hr = IPin_QueryAccept(pin, &mt);
-    todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
+    ok(hr == S_FALSE, "Got hr %#lx.\n", hr);

mt = mp3_mt1;
     mt.formattype = GUID_NULL;
     hr = IPin_QueryAccept(pin, &mt);
-    todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
+    ok(hr == S_FALSE, "Got hr %#lx.\n", hr);

IPin_Release(pin);

diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c
index 79b3a8af89b..0956f844bd7 100644
--- a/dlls/winegstreamer/quartz_transform.c
+++ b/dlls/winegstreamer/quartz_transform.c
@@ -737,6 +737,18 @@ HRESULT mpeg_audio_codec_create(IUnknown *outer, IUnknown **out)

static HRESULT mpeg_layer3_decoder_sink_query_accept(struct transform *filter, const AM_MEDIA_TYPE *mt)
 {
+    const MPEGLAYER3WAVEFORMAT *format;
+
+    if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio)
+            || !IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx)
+            || mt->cbFormat < sizeof(MPEGLAYER3WAVEFORMAT))
+        return S_FALSE;
+
+    format = (const MPEGLAYER3WAVEFORMAT *)mt->pbFormat;
+
+    if (format->wfx.wFormatTag != WAVE_FORMAT_MPEGLAYER3)
+        return S_FALSE;
+
     return S_OK;
 }