Anton Baskanov : amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream.
Alexandre Julliard
julliard at winehq.org
Tue Nov 10 13:46:24 CST 2020
Module: wine
Branch: stable
Commit: 59adc57590b50df0eaf09d73bb5d8facc9b30a40
URL: https://source.winehq.org/git/wine.git/?a=commit;h=59adc57590b50df0eaf09d73bb5d8facc9b30a40
Author: Anton Baskanov <baskanov at gmail.com>
Date: Mon May 25 14:17:33 2020 -0500
amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream.
Signed-off-by: Anton Baskanov <baskanov at gmail.com>
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 4300981d6b997c0b4c70c3415d4bbcd694d1a7f1)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/amstream/audiostream.c | 14 +++++++-------
dlls/amstream/ddrawstream.c | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c
index 911cbd4d19f..17723db6c21 100644
--- a/dlls/amstream/audiostream.c
+++ b/dlls/amstream/audiostream.c
@@ -259,18 +259,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;
}
diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index 48ccc52d47c..671585f5d63 100644
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -127,18 +127,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;
}
More information about the wine-cvs
mailing list