system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-15 03:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

mf/samplegrabber: Test shutdown state under the lock for methods that modify item queue.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-05-15 18:32:55 +03:00 committed by Alexandre Julliard
parent 7a44796de4
commit 710cc2bcfb
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dlls/mf/samplegrabber.c
View file

@ -407,12 +407,11 @@ static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface,
if (!sample)
return S_OK;
if (grabber->is_shut_down)
return MF_E_STREAMSINK_REMOVED;
EnterCriticalSection(&grabber->cs);
if (grabber->state == SINK_STATE_RUNNING)
if (grabber->is_shut_down)
hr = MF_E_STREAMSINK_REMOVED;
else if (grabber->state == SINK_STATE_RUNNING)
{
hr = IMFSample_GetSampleTime(sample, &sampletime);
@ -479,12 +478,11 @@ static HRESULT WINAPI sample_grabber_stream_PlaceMarker(IMFStreamSink *iface, MF
TRACE("%p, %d, %p, %p.\n", iface, marker_type, marker_value, context_value);
if (grabber->is_shut_down)
return MF_E_STREAMSINK_REMOVED;
EnterCriticalSection(&grabber->cs);
if (grabber->state == SINK_STATE_RUNNING)
if (grabber->is_shut_down)
hr = MF_E_STREAMSINK_REMOVED;
else if (grabber->state == SINK_STATE_RUNNING)
hr = stream_place_marker(grabber, marker_type, context_value);
LeaveCriticalSection(&grabber->cs);