Skip to content

Fix memory leak of WINHTTP_PROXY_INFO fields #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2017
Merged

Fix memory leak of WINHTTP_PROXY_INFO fields #495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions Release/src/http/client/http_client_winhttp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,24 @@ static DWORD ChooseAuthScheme( DWORD dwSupportedSchemes )
return 0;
}

// Small RAII helper to ensure that the fields of this struct are always
// properly freed.
struct proxy_info : WINHTTP_PROXY_INFO
{
proxy_info()
{
memset( this, 0, sizeof(WINHTTP_PROXY_INFO) );
}

~proxy_info()
{
if ( lpszProxy )
::GlobalFree(lpszProxy);
if ( lpszProxyBypass )
::GlobalFree(lpszProxyBypass);
}
};

// WinHTTP client.
class winhttp_client : public _http_client_communicator
{
Expand Down Expand Up @@ -492,14 +510,13 @@ class winhttp_client : public _http_client_communicator
http_request &msg = request->m_request;
winhttp_request_context * winhttp_context = static_cast<winhttp_request_context *>(request.get());

WINHTTP_PROXY_INFO info;
proxy_info info;
bool proxy_info_required = false;

if( client_config().proxy().is_auto_discovery() )
{
WINHTTP_AUTOPROXY_OPTIONS autoproxy_options;
memset( &autoproxy_options, 0, sizeof(WINHTTP_AUTOPROXY_OPTIONS) );
memset( &info, 0, sizeof(WINHTTP_PROXY_INFO) );

autoproxy_options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT;
autoproxy_options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DHCP | WINHTTP_AUTO_DETECT_TYPE_DNS_A;
Expand Down