generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/socks.c: Avoid type conversions where possible

Browse Source 
Streamlined variable names and types to avoid type conversions that
may result in data being lost on non 32-bit systems.
This commit is contained in:
Marc Hoersken 2012-10-04 20:17:49 +02:00
parent 90821c6202
commit cd423348d9
1 changed files with 15 additions and 16 deletions

31
lib/socks.c

@ -370,8 +370,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
long timeout; long timeout;
bool socks5_resolve_local = (conn->proxytype == CURLPROXY_SOCKS5)?TRUE:FALSE; bool socks5_resolve_local = (conn->proxytype == CURLPROXY_SOCKS5)?TRUE:FALSE;
const size_t hostname_len = strlen(hostname); const size_t hostname_len = strlen(hostname);
ssize_t packetsize = 0; ssize_t len = 0, packetsize = 0;
int len;
/* RFC1928 chapter 5 specifies max 255 chars for domain name in packet */ /* RFC1928 chapter 5 specifies max 255 chars for domain name in packet */
if(!socks5_resolve_local && hostname_len > 255) { if(!socks5_resolve_local && hostname_len > 255) {
@ -474,14 +473,14 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
#endif #endif
else if(socksreq[1] == 2) { else if(socksreq[1] == 2) {
/* Needs user name and password */ /* Needs user name and password */
size_t userlen, pwlen; size_t proxy_name_len, proxy_password_len;
if(proxy_name && proxy_password) { if(proxy_name && proxy_password) {
userlen = strlen(proxy_name); proxy_name_len = strlen(proxy_name);
pwlen = strlen(proxy_password); proxy_password_len = strlen(proxy_password);
} }
else { else {
userlen = 0; proxy_name_len = 0;
pwlen = 0; proxy_password_len = 0;
} }
/* username/password request looks like /* username/password request looks like
@ -493,14 +492,14 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
*/ */
len = 0; len = 0;
socksreq[len++] = 1; /* username/pw subnegotiation version */ socksreq[len++] = 1; /* username/pw subnegotiation version */
socksreq[len++] = (unsigned char) userlen; socksreq[len++] = (unsigned char) proxy_name_len;
if(proxy_name && userlen) if(proxy_name && proxy_name_len)
memcpy(socksreq + len, proxy_name, userlen); memcpy(socksreq + len, proxy_name, proxy_name_len);
len += (int)userlen; len += proxy_name_len;
socksreq[len++] = (unsigned char) pwlen; socksreq[len++] = (unsigned char) proxy_password_len;
if(proxy_password && pwlen) if(proxy_password && proxy_password_len)
memcpy(socksreq + len, proxy_password, pwlen); memcpy(socksreq + len, proxy_password, proxy_password_len);
len += (int)pwlen; len += proxy_password_len;
code = Curl_write_plain(conn, sock, (char *)socksreq, len, &written); code = Curl_write_plain(conn, sock, (char *)socksreq, len, &written);
if((code != CURLE_OK) || (len != written)) { if((code != CURLE_OK) || (len != written)) {
@ -563,7 +562,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
socksreq[len++] = 3; /* ATYP: domain name = 3 */ socksreq[len++] = 3; /* ATYP: domain name = 3 */
socksreq[len++] = (char) hostname_len; /* address length */ socksreq[len++] = (char) hostname_len; /* address length */
memcpy(&socksreq[len], hostname, hostname_len); /* address str w/o NULL */ memcpy(&socksreq[len], hostname, hostname_len); /* address str w/o NULL */
len += (int)hostname_len; len += hostname_len;
} }
else { else {
struct Curl_dns_entry *dns; struct Curl_dns_entry *dns;