Commit cc3384a2 authored by Marc Hoersken's avatar Marc Hoersken
Browse files

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

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

Reported-by: David Kalnischkies
parent 59580e12

lib/socks.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

      }