From b820e40f340f142b8475721538f768d59dc9c353 Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Sat, 20 Aug 2016 21:38:09 +0200 Subject: socks.c: display the hostname returned by the SOCKS5 proxy server Instead of displaying the requested hostname the one returned by the SOCKS5 proxy server is used in case of connection error. The requested hostname is displayed earlier in the connection sequence. The upper-value of the port is moved to a temporary variable and replaced with a 0-byte to make sure the hostname is 0-terminated. --- lib/socks.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/socks.c') diff --git a/lib/socks.c b/lib/socks.c index 01607bbaf..1c01a0b93 100644 --- a/lib/socks.c +++ b/lib/socks.c @@ -734,12 +734,15 @@ CURLcode Curl_SOCKS5(const char *proxy_name, (unsigned char)socksreq[1]); } else if(socksreq[3] == 3) { + unsigned char port_upper = (unsigned char)socksreq[len - 2]; + socksreq[len - 2] = 0; failf(data, "Can't complete SOCKS5 connection to %s:%d. (%d)", - hostname, - (((unsigned char)socksreq[len - 2] << 8) | + (char *)&socksreq[5], + ((port_upper << 8) | (unsigned char)socksreq[len - 1]), (unsigned char)socksreq[1]); + socksreq[len - 2] = port_upper; } else if(socksreq[3] == 4) { failf(data, -- cgit v1.2.3