aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-01-23 08:29:56 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-01-23 08:29:56 +0000
commit4120b7b0c0f37f6227a1cfc1373ec550ef47f6b2 (patch)
tree238aee0ba543a8a6be67072c57aa10abac82a8ee
parentfac1c13895b62464abd7c4e875d46b12ec7873c0 (diff)
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
-rw-r--r--lib/url.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/url.c b/lib/url.c
index e85af3a1a..d31417b0a 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -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
* +----+------+----------+------+----------+