system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 02:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

strmbase: Check the peer direction in source_Connect().

Browse source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-04-05 19:49:45 -05:00 committed by Alexandre Julliard
parent bd80194abd
commit 0c1d931243
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/qcap/tests/qcap.c
View file

@ -1433,7 +1433,7 @@ static void test_AviMux(char *arg)
pin, &source_filter.IPin_iface);
hr = IPin_Connect(avimux_out, &source_filter.IPin_iface, NULL);
todo_wine ok(hr == VFW_E_INVALID_DIRECTION, "Connect returned %x\n", hr);
ok(hr == VFW_E_INVALID_DIRECTION, "Connect returned %x\n", hr);
hr = IBaseFilter_JoinFilterGraph(avimux, (IFilterGraph*)&GraphBuilder, NULL);
ok(hr == S_OK, "JoinFilterGraph returned %x\n", hr);

11
dlls/strmbase/pin.c
View file

@ -447,6 +447,7 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP
struct strmbase_source *pin = impl_source_from_IPin(iface);
AM_MEDIA_TYPE candidate, *candidate_ptr;
IEnumMediaTypes *enummt;
PIN_DIRECTION dir;
unsigned int i;
ULONG count;
HRESULT hr;
@ -458,10 +459,12 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP
if (!peer)
return E_POINTER;
/* If we try to connect to ourselves, we will definitely deadlock.
* There are other cases where we could deadlock too, but this
* catches the obvious case */
assert(peer != iface);
IPin_QueryDirection(peer, &dir);
if (dir != PINDIR_INPUT)
{
WARN("Attempt to connect to another source pin, returning VFW_E_INVALID_DIRECTION.\n");
return VFW_E_INVALID_DIRECTION;
}
EnterCriticalSection(&pin->pin.filter->csFilter);