Zebediah Figura : devenum: Check for null pointer in IMoniker_BindToObject ().

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 2482b0f3e1028aebda04b7518e763ef60bd52541
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2482b0f3e1028aebda04b7518...

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Sat Apr 28 12:30:09 2018 -0500

devenum: Check for null pointer in IMoniker_BindToObject().

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

---

 dlls/devenum/mediacatenum.c  | 3 +++
 dlls/devenum/tests/devenum.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c
index 0d4e01e..f5633b2 100644
--- a/dlls/devenum/mediacatenum.c
+++ b/dlls/devenum/mediacatenum.c
@@ -409,6 +409,9 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToObject(IMoniker *iface, IBi
 
     TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riidResult), ppvResult);
 
+    if (!ppvResult)
+        return E_POINTER;
+
     VariantInit(&var);
     *ppvResult = NULL;
 
diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c
index 0437b6b..b52042d 100644
--- a/dlls/devenum/tests/devenum.c
+++ b/dlls/devenum/tests/devenum.c
@@ -109,6 +109,9 @@ static void test_devenum(IBindCtx *bind_ctx)
                     }
                 }
 
+                hr = IMoniker_BindToObject(moniker, bind_ctx, NULL, &IID_IUnknown, NULL);
+                ok(hr == E_POINTER, "got %#x\n", hr);
+
                 IPropertyBag_Release(prop_bag);
                 IMoniker_Release(moniker);
             }