[PATCH 0/1] MR11143: mfplat/tests: Avoid crash if mediasource retrieval failed.
Followup to e438931e48. [Test pattern page mfplat:mfplat](https://test.winehq.org/data/patterns.html#mfplat:mfplat) [Testbot run with this patch](https://testbot.winehq.org/JobDetails.pl?Key=163375) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11143
From: Bernhard Übelacker <bernhardu@mailbox.org> Followup to e438931e48. --- dlls/mfplat/tests/mfplat.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 2a8af296c91..1e6fa0639c3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1430,8 +1430,11 @@ static void test_source_resolver(void) hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, pathW, MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, (IUnknown **)&mediasource); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - IMFMediaSource_Shutdown(mediasource); - IMFMediaSource_Release(mediasource); + if (SUCCEEDED(hr)) + { + IMFMediaSource_Shutdown(mediasource); + IMFMediaSource_Release(mediasource); + } IMFByteStream_Release(stream); hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); @@ -1457,8 +1460,11 @@ static void test_source_resolver(void) MF_RESOLUTION_MEDIASOURCE | MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE, NULL, &obj_type, (IUnknown **)&mediasource); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - IMFMediaSource_Shutdown(mediasource); - IMFMediaSource_Release(mediasource); + if (SUCCEEDED(hr)) + { + IMFMediaSource_Shutdown(mediasource); + IMFMediaSource_Release(mediasource); + } IMFByteStream_Release(stream); hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11143
This merge request was approved by Nikolay Sivov. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11143
participants (3)
-
Bernhard Übelacker -
Bernhard Übelacker (@bernhardu) -
Nikolay Sivov (@nsivov)