system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 02:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

urlmon: Validate URL and output pointer in CreateURLMoniker.

Browse source
This commit is contained in:
Andrew Nguyen 2010-05-19 22:25:54 -05:00 committed by Alexandre Julliard
parent 1943d84ce0
commit e92cca8df6
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/urlmon/tests/url.c
View file

@ -242,6 +242,26 @@ static void test_CreateURLMoniker(LPCWSTR url1, LPCWSTR url2)
IMoniker *mon1 = NULL;
IMoniker *mon2 = NULL;
hr = CreateURLMoniker(NULL, NULL, NULL);
ok(hr == E_INVALIDARG,
"Expected CreateURLMoniker to return E_INVALIDARG, got 0x%08x\n", hr);
mon1 = (IMoniker *)0xdeadbeef;
hr = CreateURLMoniker(NULL, NULL, &mon1);
ok(hr == E_INVALIDARG,
"Expected CreateURLMoniker to return E_INVALIDARG, got 0x%08x\n", hr);
ok(mon1 == NULL, "Expected the output pointer to be NULL, got %p\n", mon1);
hr = CreateURLMoniker(NULL, emptyW, NULL);
ok(hr == E_INVALIDARG,
"Expected CreateURLMoniker to return E_INVALIDARG, got 0x%08x\n", hr);
hr = CreateURLMoniker(NULL, emptyW, &mon1);
ok(hr == S_OK ||
broken(hr == MK_E_SYNTAX), /* IE5/IE5.01/IE6 SP2 */
"Expected CreateURLMoniker to return S_OK, got 0x%08x\n", hr);
if(mon1) IMoniker_Release(mon1);
hr = CreateURLMoniker(NULL, url1, &mon1);
ok(SUCCEEDED(hr), "failed to create moniker: 0x%08x\n", hr);
if(SUCCEEDED(hr)) {

6
dlls/urlmon/umon.c
View file

@ -513,6 +513,12 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker
TRACE("(%p, %s, %p, %08x)\n", pmkContext, debugstr_w(szURL), ppmk, dwFlags);
if (ppmk)
*ppmk = NULL;
if (!szURL || !ppmk)
return E_INVALIDARG;
if (dwFlags & URL_MK_UNIFORM) FIXME("ignoring flag URL_MK_UNIFORM\n");
if(!(obj = alloc_moniker()))