mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 15:48:49 -05:00
check the arguments to the socks5 function, as the name and password might
be NULL pointers, and if non-NULL if now support zero-length names/passwords
This commit is contained in:
parent
fac1c13895
commit
4120b7b0c0
@ -1590,7 +1590,7 @@ static int handleSock5Proxy(const char *proxy_name,
|
||||
Curl_nonblock(sock, FALSE);
|
||||
|
||||
socksreq[0] = 5; /* version */
|
||||
socksreq[1] = (char)(proxy_name[0] ? 2 : 1); /* number of methods (below) */
|
||||
socksreq[1] = (char)(proxy_name ? 2 : 1); /* number of methods (below) */
|
||||
socksreq[2] = 0; /* no authentication */
|
||||
socksreq[3] = 2; /* username/password */
|
||||
|
||||
@ -1620,7 +1620,7 @@ static int handleSock5Proxy(const char *proxy_name,
|
||||
int userlen, pwlen, len;
|
||||
|
||||
userlen = strlen(proxy_name);
|
||||
pwlen = strlen(proxy_password);
|
||||
pwlen = proxy_password?strlen(proxy_password):0;
|
||||
|
||||
/* username/password request looks like
|
||||
* +----+------+----------+------+----------+
|
||||
|
Loading…
Reference in New Issue
Block a user