[url] Fixed wrong argument (Coverity)
Paul Vriens
Paul.Vriens at xs4all.nl
Sun Sep 17 08:56:05 CDT 2006
Hi,
Juan already marked CID-739 as being a BUG.
Passing a NULL ret_path doesn't bring us anything. I've added a simple test
for shlwapi to prove this.
Changelog
Fixed wrong argument
Cheers,
Paul.
---
dlls/shlwapi/tests/path.c | 6 ++++++
dlls/url/url_main.c | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c
index f700038..9bc534a 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 eeb4483..0d8b5eb 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);
--
1.4.2.1
More information about the wine-patches
mailing list