Gijs Vermeulen : amstream: Don't crash on NULL ddraw in IDirectDrawMediaStream::GetDirectDraw().

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 286946a5333ae299fc89949e4211357a3c13c10e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=286946a5333ae299fc89949e4...

Author: Gijs Vermeulen <gijsvrm(a)gmail.com>
Date:   Fri Jun 19 16:10:30 2020 +0200

amstream: Don't crash on NULL ddraw in IDirectDrawMediaStream::GetDirectDraw().

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 1e81d551903d548d42d04d5076181741309d23c8)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/amstream/ddrawstream.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index 671585f5d63..ff7cf1ab3f5 100644
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -393,6 +393,9 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMedi
 
     TRACE("(%p)->(%p)\n", iface, ddraw);
 
+    if (!ddraw)
+        return E_POINTER;
+
     *ddraw = NULL;
     if (!This->ddraw)
     {