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

winhttp: Avoid casting away const.

This commit is contained in:
Alexandre Julliard 2009-07-22 14:48:09 +02:00
parent 8ed1f0547e
commit af77e9b388
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/winhttp/session.c
View File

@ -886,16 +886,16 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
if (hdr->flags & WINHTTP_PROXY_TYPE_PROXY) if (hdr->flags & WINHTTP_PROXY_TYPE_PROXY)
{ {
BOOL sane = FALSE; BOOL sane = FALSE;
LPWSTR proxy = NULL;
LPWSTR proxy_bypass = NULL;
/* Sanity-check length of proxy string */ /* Sanity-check length of proxy string */
if ((BYTE *)len - buf + *len <= size) if ((BYTE *)len - buf + *len <= size)
{ {
sane = TRUE; sane = TRUE;
info->lpszProxy = GlobalAlloc( 0, proxy = GlobalAlloc( 0, (*len + 1) * sizeof(WCHAR) );
(*len + 1) * sizeof(WCHAR) ); if (proxy)
if (info->lpszProxy) copy_char_to_wchar_sz( (BYTE *)(len + 1), *len, proxy );
copy_char_to_wchar_sz( (BYTE *)(len + 1),
*len, (LPWSTR)info->lpszProxy );
len = (DWORD *)((BYTE *)(len + 1) + *len); len = (DWORD *)((BYTE *)(len + 1) + *len);
} }
if (sane) if (sane)
@ -903,19 +903,19 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
/* Sanity-check length of proxy bypass string */ /* Sanity-check length of proxy bypass string */
if ((BYTE *)len - buf + *len <= size) if ((BYTE *)len - buf + *len <= size)
{ {
info->lpszProxyBypass = GlobalAlloc( 0, proxy_bypass = GlobalAlloc( 0, (*len + 1) * sizeof(WCHAR) );
(*len + 1) * sizeof(WCHAR) ); if (proxy_bypass)
if (info->lpszProxyBypass) copy_char_to_wchar_sz( (BYTE *)(len + 1), *len, proxy_bypass );
copy_char_to_wchar_sz( (BYTE *)(len + 1),
*len, (LPWSTR)info->lpszProxyBypass );
} }
else else
{ {
sane = FALSE; sane = FALSE;
GlobalFree( (LPWSTR)info->lpszProxy ); GlobalFree( proxy );
info->lpszProxy = NULL; proxy = NULL;
} }
} }
info->lpszProxy = proxy;
info->lpszProxyBypass = proxy_bypass;
if (sane) if (sane)
{ {
got_from_reg = TRUE; got_from_reg = TRUE;