Huw Davies : wininet: Fix the case when Proxy or ProxyBypass is NULL.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Aug 7 08:26:37 CDT 2007
Module: wine
Branch: master
Commit: dc881a258e0881e1a20417f5dbfdd72535a025e2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc881a258e0881e1a20417f5dbfdd72535a025e2
Author: Huw Davies <huw at codeweavers.com>
Date: Tue Aug 7 10:33:20 2007 +0100
wininet: Fix the case when Proxy or ProxyBypass is NULL.
---
dlls/wininet/internet.c | 28 ++++++++--------------------
1 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index fb6970b..b6a29a5 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -2100,25 +2100,19 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
proxyBytesRequired);
pPI->dwAccessType = lpwai->dwAccessType;
+ pPI->lpszProxy = NULL;
+ pPI->lpszProxyBypass = NULL;
if (lpwai->lpszProxy)
{
lstrcpyW(proxy, lpwai->lpszProxy);
+ pPI->lpszProxy = proxy;
}
- else
- {
- *proxy = 0;
- }
- pPI->lpszProxy = proxy;
if (lpwai->lpszProxyBypass)
{
lstrcpyW(proxy_bypass, lpwai->lpszProxyBypass);
+ pPI->lpszProxyBypass = proxy_bypass;
}
- else
- {
- *proxy_bypass = 0;
- }
- pPI->lpszProxyBypass = proxy_bypass;
bSuccess = TRUE;
}
*lpdwBufferLength = sizeof(INTERNET_PROXY_INFOW) +
@@ -2147,28 +2141,22 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
proxyBytesRequired);
pPI->dwAccessType = lpwai->dwAccessType;
+ pPI->lpszProxy = NULL;
+ pPI->lpszProxyBypass = NULL;
if (lpwai->lpszProxy)
{
WideCharToMultiByte(CP_ACP, 0, lpwai->lpszProxy, -1,
proxy, proxyBytesRequired, NULL, NULL);
+ pPI->lpszProxy = proxy;
}
- else
- {
- *proxy = '\0';
- }
- pPI->lpszProxy = proxy;
if (lpwai->lpszProxyBypass)
{
WideCharToMultiByte(CP_ACP, 0, lpwai->lpszProxyBypass,
-1, proxy_bypass, proxyBypassBytesRequired,
NULL, NULL);
+ pPI->lpszProxyBypass = proxy_bypass;
}
- else
- {
- *proxy_bypass = '\0';
- }
- pPI->lpszProxyBypass = proxy_bypass;
bSuccess = TRUE;
}
*lpdwBufferLength = sizeof(INTERNET_PROXY_INFOA) +
More information about the wine-cvs
mailing list