diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c
index f700038b506..9bc534a05ab 100644
--- a/dlls/shlwapi/tests/path.c
+++ b/dlls/shlwapi/tests/path.c
@@ -738,6 +738,12 @@ static void test_PathCreateFromUrl(void)
     DWORD len, ret;
     WCHAR ret_pathW[INTERNET_MAX_URL_LENGTH];
     WCHAR *pathW, *urlW;
+    static const char url[] = "http://www.winehq.org";
+
+    /* Check ret_path = NULL */
+    len = sizeof(url);
+    ret = PathCreateFromUrlA(url, NULL, &len, 0); 
+    ok ( ret == E_INVALIDARG, "got 0x%08lx expected E_INVALIDARG\n", ret);
 
     for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) {
         len = INTERNET_MAX_URL_LENGTH;
diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c
index eeb44838b8e..0d8b5ebb422 100644
--- a/dlls/url/url_main.c
+++ b/dlls/url/url_main.c
@@ -66,7 +66,7 @@ BOOL WINAPI InetIsOffline(void)
 
 HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, LPCSTR pszUrl,int nShowCmd)
 {
-    LPSTR pszPath = NULL;
+    CHAR pszPath[MAX_PATH];
     DWORD size = MAX_PATH;
     HRESULT createpath = PathCreateFromUrlA(pszUrl,pszPath,&size,0);