Module: wine Branch: master Commit: 8cd4d9fb47021badd0a9747c106dd9a18be207c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd4d9fb47021badd0a9747c1...
Author: Zebediah Figura z.figura12@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@gmail.com Signed-off-by: Alexandre Julliard julliard@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 b0cdc6c..a76c7be 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -444,6 +444,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 293ba8d..383619c 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -134,6 +134,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); }