ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhttp: Fix memory leak on error path in WinHttpCrackUrl (Coverity). 

And use a single variable for the encoded or decoded URL so that free
only has to be called once.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alex Henrie 2022-02-02 00:23:17 -07:00 committed by Alexandre Julliard
parent ad90181e14
commit 2b63fdd9a5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/winhttp/url.c
View File

@ -172,7 +172,7 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret )
*/ */
BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc ) BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc )
{ {
WCHAR *p, *q, *r, *url_decoded = NULL, *url_escaped = NULL; WCHAR *p, *q, *r, *url_transformed = NULL;
INTERNET_SCHEME scheme_number = 0; INTERNET_SCHEME scheme_number = 0;
struct url_component scheme, username, password, hostname, path, extra; struct url_component scheme, username, password, hostname, path, extra;
BOOL overflow = FALSE; BOOL overflow = FALSE;
@ -189,25 +189,26 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN
if (flags & ICU_ESCAPE) if (flags & ICU_ESCAPE)
{ {
if ((err = escape_url( url, &len, &url_escaped ))) if ((err = escape_url( url, &len, &url_transformed )))
{ {
SetLastError( err ); SetLastError( err );
return FALSE; return FALSE;
} }
url = url_escaped; url = url_transformed;
} }
else if (flags & ICU_DECODE) else if (flags & ICU_DECODE)
{ {
if (!(url_decoded = decode_url( url, &len ))) if (!(url_transformed = decode_url( url, &len )))
{ {
SetLastError( ERROR_OUTOFMEMORY ); SetLastError( ERROR_OUTOFMEMORY );
return FALSE; return FALSE;
} }
url = url_decoded; url = url_transformed;
} }
if (!(p = wcschr( url, ':' ))) if (!(p = wcschr( url, ':' )))
{ {
SetLastError( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); SetLastError( ERROR_WINHTTP_UNRECOGNIZED_SCHEME );
free( url_transformed );
return FALSE; return FALSE;
} }
if (p - url == 4 && !wcsnicmp( url, L"http", 4 )) scheme_number = INTERNET_SCHEME_HTTP; if (p - url == 4 && !wcsnicmp( url, L"http", 4 )) scheme_number = INTERNET_SCHEME_HTTP;
@ -331,8 +332,7 @@ exit:
if (overflow) err = ERROR_INSUFFICIENT_BUFFER; if (overflow) err = ERROR_INSUFFICIENT_BUFFER;
uc->nScheme = scheme_number; uc->nScheme = scheme_number;
} }
free( url_decoded ); free( url_transformed );
free( url_escaped );
SetLastError( err ); SetLastError( err );
return !err; return !err;
} }