Vladimir Pankratov : urlmon: Handle NULL parameter.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1327ae0c74dd59861bdaf80e0cdbf3e1d7e1f75f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1327ae0c74dd59861bdaf80e0c...

Author: Vladimir Pankratov 
Date:   Wed Sep  2 16:12:03 2009 +0500

urlmon: Handle NULL parameter.

---

dlls/urlmon/tests/misc.c  |    9 +++++++++
 dlls/urlmon/urlmon_main.c |    6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index 327b90d..5b59626 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -1326,6 +1326,14 @@ static void test_MkParseDisplayNameEx(void)
     IBindCtx_Release(bctx);
 }

+static void test_IsValidURL(void)
+{
+    HRESULT hr;
+
+    hr = IsValidURL(NULL, 0, 0);
+    ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+}
+
 START_TEST(misc)
 {
     OleInitialize(NULL);
@@ -1345,6 +1353,7 @@ START_TEST(misc)
     test_UrlMkGetSessionOption();
     test_user_agent();
     test_MkParseDisplayNameEx();
+    test_IsValidURL();

OleUninitialize();
 }
diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c
index 3640adc..a420308 100644
--- a/dlls/urlmon/urlmon_main.c
+++ b/dlls/urlmon/urlmon_main.c
@@ -393,10 +393,10 @@ HRESULT WINAPI DllRegisterServerEx(void)
 HRESULT WINAPI IsValidURL(LPBC pBC, LPCWSTR szURL, DWORD dwReserved)
 {
     FIXME("(%p, %s, %d): stub\n", pBC, debugstr_w(szURL), dwReserved);
-    
-    if (pBC != NULL || dwReserved != 0)
+
+    if (pBC || dwReserved || !szURL)
         return E_INVALIDARG;
-    
+
     return S_OK;
 }