[PATCH 0/1] MR696: mfreadwrite/reader: Only attempt to copy sample buffers from responses with non-NULL samples.

[Henri Verbeet (＠hverbeet)]

For example, queueing a MF_SOURCE_READERF_ENDOFSTREAM response will set
a NULL sample. This fixes a regression introduced by commit
68fa3f673633c138596b86ad2ed1befcd0cc63c5.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/696

[PATCH 1/1] mfreadwrite/reader: Only attempt to copy sample buffers from responses with non-NULL samples.

[Henri Verbeet]

From: Henri Verbeet <hverbeet(a)codeweavers.com>

For example, queueing a MF_SOURCE_READERF_ENDOFSTREAM response will set
a NULL sample. This fixes a regression introduced by commit
68fa3f673633c138596b86ad2ed1befcd0cc63c5.
---
 dlls/mfreadwrite/reader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c
index f29d48b6a9e..5296e77f3c3 100644
--- a/dlls/mfreadwrite/reader.c
+++ b/dlls/mfreadwrite/reader.c
@@ -958,7 +958,7 @@ static struct stream_response *media_stream_pop_response(struct source_reader *r
 
         if (!stream) stream = &reader->streams[response->stream_index];
 
-        if (stream->allocator)
+        if (response->sample && stream->allocator)
         {
             /* Return allocation error to the caller, while keeping original response sample in for later. */
             if (SUCCEEDED(hr = IMFVideoSampleAllocatorEx_AllocateSample(stream->allocator, &sample)))
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/696

[PATCH 0/1] MR696: mfreadwrite/reader: Only attempt to copy sample buffers from responses with non-NULL samples. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/696