From: Marc Hoersken <info@marc-hoersken.de>
Date: Sun, 14 Aug 2016 15:05:32 +0000 (+0200)
Subject: socks.c: Do not modify and invalidate calculated response length
X-Git-Tag: curl-7_50_2~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc3384a254bbffc64f3dd2a2d3d61fe84ec7472d;p=thirdparty%2Fcurl.git

socks.c: Do not modify and invalidate calculated response length

Second commit to fix issue #944 regarding SOCKS5 error handling.

Reported-by: David Kalnischkies
---

diff --git a/lib/socks.c b/lib/socks.c
index a3c6ee0882..bb93e424a1 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -702,10 +702,9 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
     /* decrypt_gssapi_blockread already read the whole packet */
 #endif
     if(len > 10) {
-      len -= 10;
       result = Curl_blockread_all(conn, sock, (char *)&socksreq[10],
-                                  len, &actualread);
-      if(result || (len != actualread)) {
+                                  len - 10, &actualread);
+      if(result || ((len - 10) != actualread)) {
         failf(data, "Failed to receive SOCKS5 connect request ack.");
         return CURLE_COULDNT_CONNECT;
       }