Hans Leidekker : wininet: Avoid accessing uninitialized memory.
Alexandre Julliard
julliard at winehq.org
Mon Oct 26 10:08:32 CDT 2009
Module: wine
Branch: master
Commit: 4a8f4f28670343f59e808ca2c9823ba52de0628b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8f4f28670343f59e808ca2c9823ba52de0628b
Author: Hans Leidekker <hans at codeweavers.com>
Date: Mon Oct 26 09:56:04 2009 +0100
wininet: Avoid accessing uninitialized memory.
Found by valgrind.
---
dlls/wininet/cookie.c | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c
index 30e0b99..75cf049 100644
--- a/dlls/wininet/cookie.c
+++ b/dlls/wininet/cookie.c
@@ -163,7 +163,6 @@ static cookie_domain *COOKIE_addDomain(LPCWSTR domain, LPCWSTR path)
static BOOL COOKIE_crackUrlSimple(LPCWSTR lpszUrl, LPWSTR hostName, int hostNameLen, LPWSTR path, int pathLen)
{
URL_COMPONENTSW UrlComponents;
- BOOL rc;
UrlComponents.lpszExtraInfo = NULL;
UrlComponents.lpszPassword = NULL;
@@ -178,22 +177,28 @@ static BOOL COOKIE_crackUrlSimple(LPCWSTR lpszUrl, LPWSTR hostName, int hostName
UrlComponents.dwHostNameLength = hostNameLen;
UrlComponents.dwUrlPathLength = pathLen;
- rc = InternetCrackUrlW(lpszUrl, 0, 0, &UrlComponents);
+ if (!InternetCrackUrlW(lpszUrl, 0, 0, &UrlComponents)) return FALSE;
/* discard the webpage off the end of the path */
- if (pathLen > 0 && path[pathLen-1] != '/')
+ if (UrlComponents.dwUrlPathLength)
{
- LPWSTR ptr;
- ptr = strrchrW(path,'/');
- if (ptr)
- *(++ptr) = 0;
- else
+ if (path[UrlComponents.dwUrlPathLength - 1] != '/')
{
- path[0] = '/';
- path[1] = 0;
+ WCHAR *ptr;
+ if ((ptr = strrchrW(path, '/'))) *(++ptr) = 0;
+ else
+ {
+ path[0] = '/';
+ path[1] = 0;
+ }
}
}
- return rc;
+ else if (pathLen >= 2)
+ {
+ path[0] = '/';
+ path[1] = 0;
+ }
+ return TRUE;
}
/* match a domain. domain must match if the domain is not NULL. path must match if the path is not NULL */
@@ -569,7 +574,7 @@ BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
return FALSE;
}
- hostName[0] = path[0] = 0;
+ hostName[0] = 0;
ret = COOKIE_crackUrlSimple(lpszUrl, hostName, sizeof(hostName)/sizeof(hostName[0]), path, sizeof(path)/sizeof(path[0]));
if (!ret || !hostName[0]) return FALSE;
More information about the wine-cvs
mailing list