oleaut32: Check pointer in IPicture_get_Attributes.
This commit is contained in:
parent
5b88f0d916
commit
76925b06c2
|
@ -842,6 +842,10 @@ static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface,
|
||||||
{
|
{
|
||||||
OLEPictureImpl *This = (OLEPictureImpl *)iface;
|
OLEPictureImpl *This = (OLEPictureImpl *)iface;
|
||||||
TRACE("(%p)->(%p).\n", This, pdwAttr);
|
TRACE("(%p)->(%p).\n", This, pdwAttr);
|
||||||
|
|
||||||
|
if(!pdwAttr)
|
||||||
|
return E_POINTER;
|
||||||
|
|
||||||
*pdwAttr = 0;
|
*pdwAttr = 0;
|
||||||
switch (This->desc.picType) {
|
switch (This->desc.picType) {
|
||||||
case PICTYPE_UNINITIALIZED:
|
case PICTYPE_UNINITIALIZED:
|
||||||
|
|
|
@ -663,6 +663,9 @@ static void test_get_Attributes(void)
|
||||||
ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres);
|
ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres);
|
||||||
ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type);
|
ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type);
|
||||||
|
|
||||||
|
hres = IPicture_get_Attributes(pic, NULL);
|
||||||
|
ole_expect(hres, E_POINTER);
|
||||||
|
|
||||||
attr = 0xdeadbeef;
|
attr = 0xdeadbeef;
|
||||||
hres = IPicture_get_Attributes(pic, &attr);
|
hres = IPicture_get_Attributes(pic, &attr);
|
||||||
ole_expect(hres, S_OK);
|
ole_expect(hres, S_OK);
|
||||||
|
|
Loading…
Reference in New Issue