marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream. 

Signed-off-by: Anton Baskanov <baskanov@gmail.com>
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Anton Baskanov 2020-05-25 14:17:33 -05:00 committed by Alexandre Julliard
parent f5aaca10af
commit 4300981d6b
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/amstream/audiostream.c
View File

@ -429,18 +429,18 @@ static ULONG WINAPI audio_IAMMediaStream_Release(IAMMediaStream *iface)
/*** IMediaStream methods ***/
static HRESULT WINAPI audio_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface,
IMultiMediaStream** multi_media_stream)
IMultiMediaStream **mmstream)
{
struct audio_stream *This = impl_from_IAMMediaStream(iface);
struct audio_stream *stream = impl_from_IAMMediaStream(iface);
TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream);
TRACE("stream %p, mmstream %p.\n", stream, mmstream);
if (!multi_media_stream)
if (!mmstream)
return E_POINTER;
IMultiMediaStream_AddRef(This->parent);
*multi_media_stream = This->parent;
if (stream->parent)
IMultiMediaStream_AddRef(stream->parent);
*mmstream = stream->parent;
return S_OK;
}

14
dlls/amstream/ddrawstream.c
View File

@ -125,18 +125,18 @@ static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface)
/*** IMediaStream methods ***/
static HRESULT WINAPI ddraw_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface,
IMultiMediaStream** multi_media_stream)
IMultiMediaStream **mmstream)
{
struct ddraw_stream *This = impl_from_IAMMediaStream(iface);
struct ddraw_stream *stream = impl_from_IAMMediaStream(iface);
TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream);
TRACE("stream %p, mmstream %p.\n", stream, mmstream);
if (!multi_media_stream)
if (!mmstream)
return E_POINTER;
IMultiMediaStream_AddRef(This->parent);
*multi_media_stream = This->parent;
if (stream->parent)
IMultiMediaStream_AddRef(stream->parent);
*mmstream = stream->parent;
return S_OK;
}