ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Check pointer in IPicture_get_Attributes.

This commit is contained in:
Nikolay Sivov 2009-01-06 00:40:07 +03:00 committed by Alexandre Julliard
parent 5b88f0d916
commit 76925b06c2
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/oleaut32/olepicture.c
View File

@ -842,6 +842,10 @@ static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface,
{
OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(%p).\n", This, pdwAttr);
if(!pdwAttr)
return E_POINTER;
*pdwAttr = 0;
switch (This->desc.picType) {
case PICTYPE_UNINITIALIZED:

3
dlls/oleaut32/tests/olepicture.c
View File

@ -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(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type);
hres = IPicture_get_Attributes(pic, NULL);
ole_expect(hres, E_POINTER);
attr = 0xdeadbeef;
hres = IPicture_get_Attributes(pic, &attr);
ole_expect(hres, S_OK);