From: "Erich E. Hoover" Subject: [PATCH 2/6] strmbase: Fix race condition on InputPin_EndFlush between csRenderLock and filter.csFilter. Message-Id: Date: Wed, 30 Jul 2014 19:46:56 -0600 csRenderLock should be locked before filter.csFilter to avoid deadlocks. From 6b1dae05e0c9c713f565f9fa4c9696b3807c978d Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 17 Jul 2014 10:35:43 -0600 Subject: strmbase: Fix race condition on InputPin_EndFlush between csRenderLock and filter.csFilter. --- dlls/strmbase/renderer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 3acca0f..9b9c225 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -155,8 +155,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) TRACE("(%p/%p)->()\n", This, pFilter); - EnterCriticalSection(&pFilter->filter.csFilter); EnterCriticalSection(&pFilter->csRenderLock); + EnterCriticalSection(&pFilter->filter.csFilter); EnterCriticalSection(This->pin.pCritSec); hr = BaseInputPinImpl_EndFlush(iface); if (SUCCEEDED(hr)) @@ -167,8 +167,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) hr = BaseRendererImpl_EndFlush(pFilter); } LeaveCriticalSection(This->pin.pCritSec); - LeaveCriticalSection(&pFilter->csRenderLock); LeaveCriticalSection(&pFilter->filter.csFilter); + LeaveCriticalSection(&pFilter->csRenderLock); return hr; } -- 1.7.9.5