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

shell32: Avoid crash on NULL pointer.

This commit is contained in:
Detlef Riekenberg 2012-01-16 00:06:14 +01:00 committed by Alexandre Julliard
parent 9ee18919a5
commit 48155b5df0
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/shell32/assoc.c
View File

@ -84,6 +84,9 @@ static HRESULT WINAPI IQueryAssociations_fnQueryInterface(
TRACE("(%p,%s,%p)\n",This, debugstr_guid(riid), ppvObj);
if (ppvObj == NULL)
return E_POINTER;
*ppvObj = NULL;
if (IsEqualIID(riid, &IID_IUnknown) ||

3
dlls/shell32/tests/assoc.c
View File

@ -54,6 +54,9 @@ static void test_IQueryAssociations_QueryInterface(void)
IUnknown_Release(unk);
}
hr = IUnknown_QueryInterface(qa, &IID_IUnknown, NULL);
ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr);
IQueryAssociations_Release(qa);
}