Giovanni Mascellani : mfreadwrite/reader: Make the stream sample allocator callback own a reference to the source reader.
Alexandre Julliard
julliard at winehq.org
Mon Apr 11 15:54:58 CDT 2022
Module: wine
Branch: master
Commit: cdb0471eca6655051701935f18c7e5987b1fe34c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb0471eca6655051701935f18c7e5987b1fe34c
Author: Giovanni Mascellani <gmascellani at codeweavers.com>
Date: Sat Apr 9 09:16:17 2022 +0300
mfreadwrite/reader: Make the stream sample allocator callback own a reference to the source reader.
The stream sample allocator callback NotifyRelease() method assumes that
the source reader is valid. Therefore it must own a reference to it,
otherwise it might get called while the source reader is being destroyed,
causing a crash.
Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mfreadwrite/reader.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c
index bdf2e7f5a6f..2d3da19db10 100644
--- a/dlls/mfreadwrite/reader.c
+++ b/dlls/mfreadwrite/reader.c
@@ -2282,12 +2282,14 @@ static HRESULT WINAPI stream_sample_allocator_cb_QueryInterface(IMFVideoSampleAl
static ULONG WINAPI stream_sample_allocator_cb_AddRef(IMFVideoSampleAllocatorNotify *iface)
{
- return 2;
+ struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface);
+ return source_reader_addref(stream->reader);
}
static ULONG WINAPI stream_sample_allocator_cb_Release(IMFVideoSampleAllocatorNotify *iface)
{
- return 1;
+ struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface);
+ return source_reader_release(stream->reader);
}
static HRESULT WINAPI stream_sample_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface)
More information about the wine-cvs
mailing list