system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-01 07:14:31 +00:00
Code Issues Projects Releases Wiki Activity

winhttp: Fix parameters validation in WinHttpGetProxyForUrl.

Browse Source
This commit is contained in:
Piotr Caban 2024-04-25 19:47:19 +02:00 committed by Alexandre Julliard
parent 6f4c2b7f5a
commit ec65fd0ba1
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/winhttp/session.c
View File

@ -2105,10 +2105,9 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX
BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTOPROXY_OPTIONS *options,
WINHTTP_PROXY_INFO *info )
{
WCHAR *detected_pac_url = NULL;
const WCHAR *pac_url;
WCHAR *pac_url;
struct session *session;
char *script;
char *script = NULL;
DWORD size;
BOOL ret = FALSE;
@ -2128,29 +2127,29 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO
if (!url || !options || !info ||
!(options->dwFlags & (WINHTTP_AUTOPROXY_AUTO_DETECT|WINHTTP_AUTOPROXY_CONFIG_URL)) ||
((options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT) && !options->dwAutoDetectFlags) ||
((options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT) &&
(options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL)) ||
(options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL && !options->lpszAutoConfigUrl))
{
release_object( &session->hdr );
SetLastError( ERROR_INVALID_PARAMETER );
return FALSE;
}
if (options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT &&
!WinHttpDetectAutoProxyConfigUrl( options->dwAutoDetectFlags, &detected_pac_url ))
goto done;
WinHttpDetectAutoProxyConfigUrl( options->dwAutoDetectFlags, &pac_url ))
{
script = download_script( pac_url, &size );
GlobalFree( pac_url );
}
if (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL) pac_url = options->lpszAutoConfigUrl;
else pac_url = detected_pac_url;
if (!script && options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL)
script = download_script( options->lpszAutoConfigUrl, &size );
if ((script = download_script( pac_url, &size )))
if (script)
{
ret = run_script( script, size, url, info, options->dwFlags );
free( script );
}
done:
GlobalFree( detected_pac_url );
release_object( &session->hdr );
if (ret) SetLastError( ERROR_SUCCESS );
return ret;

15
dlls/winhttp/tests/winhttp.c
View File

@ -5415,6 +5415,21 @@ static void test_WinHttpGetProxyForUrl(int port)
GlobalFree( info.lpszProxyBypass );
}
options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT|WINHTTP_AUTOPROXY_CONFIG_URL;
options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DHCP|WINHTTP_AUTO_DETECT_TYPE_DNS_A;
options.lpszAutoConfigUrl = L"http://wpad/wpad.dat";
SetLastError(0xdeadbeef);
memset( &info, 0, sizeof(info) );
ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info );
error = GetLastError();
ok( error != ERROR_INVALID_PARAMETER, "got ERROR_INVALID_PARAMETER\n" );
if (ret)
{
GlobalFree( info.lpszProxy );
GlobalFree( info.lpszProxyBypass );
}
options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT;
options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DHCP|WINHTTP_AUTO_DETECT_TYPE_DNS_A;