Module: wine Branch: master Commit: 66948f8934b8aaca70cd0d2faafb81bfc51e67c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66948f8934b8aaca70cd0d2fa...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Fri Oct 22 08:22:59 2021 +0300
mfplay: Handle NULL item in SetMediaItem().
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/mfplay/player.c | 6 +++++- dlls/mfplay/tests/mfplay.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 42b40b99ea1..28226f92962 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1224,12 +1224,16 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me static HRESULT WINAPI media_player_SetMediaItem(IMFPMediaPlayer *iface, IMFPMediaItem *item_iface) { struct media_player *player = impl_from_IMFPMediaPlayer(iface); - struct media_item *item = unsafe_impl_from_IMFPMediaItem(item_iface); + struct media_item *item; IMFTopology *topology; HRESULT hr;
TRACE("%p, %p.\n", iface, item_iface);
+ if (!item_iface) + return E_POINTER; + + item = unsafe_impl_from_IMFPMediaItem(item_iface); if (item->player != iface) return E_INVALIDARG;
diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index a2d6da54f3e..438d636daa2 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -198,8 +198,23 @@ static void test_shutdown(void) IMFPMediaPlayer_Release(player); }
+static void test_media_item(void) +{ + IMFPMediaPlayer *player; + HRESULT hr; + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetMediaItem(player, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + IMFPMediaPlayer_Release(player); +} + START_TEST(mfplay) { test_create_player(); test_shutdown(); + test_media_item(); }