Skip to content

W
wine-cw
Commit dc881a25 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

wininet: Fix the case when Proxy or ProxyBypass is NULL.

parent cdbd17bd
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 20 deletions
dlls/wininet/internet.c
View file @ dc881a25
......@@ -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) +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment