[PATCH 5/7] amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream.
Anton Baskanov
baskanov at gmail.com
Fri May 22 10:40:07 CDT 2020
Signed-off-by: Anton Baskanov <baskanov at gmail.com>
---
dlls/amstream/audiostream.c | 3 ++-
dlls/amstream/ddrawstream.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c
index efa3e2aac5..d2a0c146ed 100644
--- a/dlls/amstream/audiostream.c
+++ b/dlls/amstream/audiostream.c
@@ -441,7 +441,8 @@ static HRESULT WINAPI audio_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *i
if (!multi_media_stream)
return E_POINTER;
- IMultiMediaStream_AddRef(This->parent);
+ if (This->parent)
+ IMultiMediaStream_AddRef(This->parent);
*multi_media_stream = This->parent;
return S_OK;
diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index 3bd5f46e02..966fdc6023 100644
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -134,7 +134,8 @@ static HRESULT WINAPI ddraw_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *i
if (!multi_media_stream)
return E_POINTER;
- IMultiMediaStream_AddRef(This->parent);
+ if (This->parent)
+ IMultiMediaStream_AddRef(This->parent);
*multi_media_stream = This->parent;
return S_OK;
--
2.17.1
More information about the wine-devel
mailing list