X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/57356d6317f6f33dd622711d305c4579df63b269..d6430b975d14ddbd53c40126fa9d00bea3c2d08b:/proxy.c

diff --git a/proxy.c b/proxy.c
index a02fc11c..475dc4a5 100644
--- a/proxy.c
+++ b/proxy.c
@@ -481,8 +481,7 @@ int proxy_http_negotiate (Proxy_Socket p, int change)
 	    sk_write(p->sub_socket, buf2, strlen(buf2));
 	}
 
-	sprintf(buf, "\r\n");
-	sk_write(p->sub_socket, buf, strlen(buf));
+	sk_write(p->sub_socket, "\r\n", 2);
 
 	p->state = 1;
 	return 0;
@@ -595,6 +594,7 @@ int proxy_http_negotiate (Proxy_Socket p, int change)
 	    {
 		bufchain_consume(&p->pending_input_data, eol);
 		datap += eol;
+		len   -= eol;
 		eol = get_line_end(datap, len);
 	    }
 
@@ -930,7 +930,7 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
 	    char command[22];
 	    int len;
 
-	    if (sk_addrtype(p->remote_addr) == ADDRTYPE_IPV6) {
+	    if (sk_addrtype(p->remote_addr) == ADDRTYPE_IPV4) {
 		len = 10;
 		command[3] = 1; /* IPv4 */
 	    } else {