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

oleaut32: Fix null parameters handling in ICreateTypeLib2::CreateTypeInfo().

This commit is contained in:
Nikolay Sivov 2010-12-22 23:50:51 +03:00 committed by Alexandre Julliard
parent c71998d742
commit 623abfcaae
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/oleaut32/tests/typelib.c
View File

@ -1406,6 +1406,16 @@ static void test_CreateTypeLib(void) {
SysFreeString(name);
SysFreeString(helpfile);
/* invalid parameters */
hres = ICreateTypeLib_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, &createti);
ok(hres == E_INVALIDARG, "got %08x\n", hres);
hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, NULL);
ok(hres == E_INVALIDARG, "got %08x\n", hres);
hres = ICreateTypeLib_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, NULL);
ok(hres == E_INVALIDARG, "got %08x\n", hres);
hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti);
ok(hres == S_OK, "got %08x\n", hres);

11
dlls/oleaut32/typelib2.c
View File

@ -4389,20 +4389,21 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(
ICreateTypeLib2 * iface,
LPOLESTR szName,
TYPEKIND tkind,
ICreateTypeInfo **ppCTInfo)
ICreateTypeInfo **tinfo)
{
ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface;
char *name;
TRACE("(%p,%s,%d,%p)\n", iface, debugstr_w(szName), tkind, ppCTInfo);
TRACE("(%p,%s,%d,%p)\n", iface, debugstr_w(szName), tkind, tinfo);
if (!szName || !tinfo) return E_INVALIDARG;
ctl2_encode_name(This, szName, &name);
if(ctl2_find_name(This, name) != -1)
return TYPE_E_NAMECONFLICT;
*ppCTInfo = (ICreateTypeInfo *)ICreateTypeInfo2_Constructor(This, szName, tkind);
if (!*ppCTInfo) return E_OUTOFMEMORY;
*tinfo = (ICreateTypeInfo *)ICreateTypeInfo2_Constructor(This, szName, tkind);
if (!*tinfo) return E_OUTOFMEMORY;
return S_OK;
}