d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch(3): fix regression in IPv6:port spec from r357977

Browse Source 
In case the port was specified, we never actually populated *host. Do so
now.

Pointy hat:	kevans
This commit is contained in:
Kyle Evans 2020-02-15 19:39:50 +00:00
parent 0f3fa96016
commit 3dc455e897
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libfetch/common.c
View File

@ -547,18 +547,18 @@ fetch_socks5_getenv(char **host, int *port)
if (socks5env[0] == '[') { if (socks5env[0] == '[') {
if (socks5env[slen - 1] == ']') { if (socks5env[slen - 1] == ']') {
*host = strndup(socks5env, slen); *host = strndup(socks5env, slen);
if (*host == NULL) } else if (ext != NULL) {
goto fail; *host = strndup(socks5env, ext - socks5env + 1);
} else if (ext == NULL) { } else {
socks5_seterr(SOCKS5_ERR_BAD_PROXY_FORMAT); socks5_seterr(SOCKS5_ERR_BAD_PROXY_FORMAT);
return (0); return (0);
} }
} else { } else {
*host = strndup(socks5env, ext - socks5env); *host = strndup(socks5env, ext - socks5env);
if (*host == NULL)
goto fail;
} }
if (*host == NULL)
goto fail;
if (ext == NULL) { if (ext == NULL) {
*port = 1080; /* Default port as defined in RFC1928 */ *port = 1080; /* Default port as defined in RFC1928 */
} else { } else {