Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
d6f8d8f2
Commit
d6f8d8f2
authored
Nov 26, 2013
by
Piotr Caban
Committed by
Alexandre Julliard
Nov 26, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
strmbase: Don't pass NULL fetched parameter in BaseOutputPinImpl_Connect on…
strmbase: Don't pass NULL fetched parameter in BaseOutputPinImpl_Connect on external IPin implementation.
parent
995ff1d3
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
pin.c
dlls/strmbase/pin.c
+6
-1
No files found.
dlls/strmbase/pin.c
View file @
d6f8d8f2
...
@@ -419,6 +419,9 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const
...
@@ -419,6 +419,9 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const
TRACE
(
"(%p/%p)->(%p, %p)
\n
"
,
This
,
iface
,
pReceivePin
,
pmt
);
TRACE
(
"(%p/%p)->(%p, %p)
\n
"
,
This
,
iface
,
pReceivePin
,
pmt
);
dump_AM_MEDIA_TYPE
(
pmt
);
dump_AM_MEDIA_TYPE
(
pmt
);
if
(
!
pReceivePin
)
return
E_POINTER
;
/* If we try to connect to ourselves, we will definitely deadlock.
/* If we try to connect to ourselves, we will definitely deadlock.
* There are other cases where we could deadlock too, but this
* There are other cases where we could deadlock too, but this
* catches the obvious case */
* catches the obvious case */
...
@@ -465,9 +468,11 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const
...
@@ -465,9 +468,11 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const
/* then try receiver filter's media types */
/* then try receiver filter's media types */
if
(
hr
!=
S_OK
&&
SUCCEEDED
(
hr
=
IPin_EnumMediaTypes
(
pReceivePin
,
&
pEnumCandidates
)))
/* if we haven't already connected successfully */
if
(
hr
!=
S_OK
&&
SUCCEEDED
(
hr
=
IPin_EnumMediaTypes
(
pReceivePin
,
&
pEnumCandidates
)))
/* if we haven't already connected successfully */
{
{
ULONG
fetched
;
hr
=
VFW_E_NO_ACCEPTABLE_TYPES
;
/* Assume the worst, but set to S_OK if connected successfully */
hr
=
VFW_E_NO_ACCEPTABLE_TYPES
;
/* Assume the worst, but set to S_OK if connected successfully */
while
(
S_OK
==
IEnumMediaTypes_Next
(
pEnumCandidates
,
1
,
&
pmtCandidate
,
NULL
))
while
(
S_OK
==
IEnumMediaTypes_Next
(
pEnumCandidates
,
1
,
&
pmtCandidate
,
&
fetched
))
{
{
assert
(
pmtCandidate
);
assert
(
pmtCandidate
);
dump_AM_MEDIA_TYPE
(
pmtCandidate
);
dump_AM_MEDIA_TYPE
(
pmtCandidate
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment