diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/socks.c | 28 | 
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/socks.c b/lib/socks.c index 78c4d23a5..0934ee7ca 100644 --- a/lib/socks.c +++ b/lib/socks.c @@ -300,8 +300,8 @@ CURLcode Curl_SOCKS4(const char *proxy_name,              ", request rejected or failed.",              (unsigned char)socksreq[4], (unsigned char)socksreq[5],              (unsigned char)socksreq[6], (unsigned char)socksreq[7], -            ((socksreq[8] << 8) | socksreq[9]), -            socksreq[1]); +            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]), +            (unsigned char)socksreq[1]);        return CURLE_COULDNT_CONNECT;      case 92:        failf(data, @@ -310,8 +310,8 @@ CURLcode Curl_SOCKS4(const char *proxy_name,              "identd on the client.",              (unsigned char)socksreq[4], (unsigned char)socksreq[5],              (unsigned char)socksreq[6], (unsigned char)socksreq[7], -            ((socksreq[8] << 8) | socksreq[9]), -            socksreq[1]); +            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]), +            (unsigned char)socksreq[1]);        return CURLE_COULDNT_CONNECT;      case 93:        failf(data, @@ -320,8 +320,8 @@ CURLcode Curl_SOCKS4(const char *proxy_name,              "report different user-ids.",              (unsigned char)socksreq[4], (unsigned char)socksreq[5],              (unsigned char)socksreq[6], (unsigned char)socksreq[7], -            ((socksreq[8] << 8) | socksreq[9]), -            socksreq[1]); +            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]), +            (unsigned char)socksreq[1]);        return CURLE_COULDNT_CONNECT;      default:        failf(data, @@ -329,8 +329,8 @@ CURLcode Curl_SOCKS4(const char *proxy_name,              ", Unknown.",              (unsigned char)socksreq[4], (unsigned char)socksreq[5],              (unsigned char)socksreq[6], (unsigned char)socksreq[7], -            ((socksreq[8] << 8) | socksreq[9]), -            socksreq[1]); +            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]), +            (unsigned char)socksreq[1]);        return CURLE_COULDNT_CONNECT;      }    } @@ -674,15 +674,15 @@ CURLcode Curl_SOCKS5(const char *proxy_name,              "Can't complete SOCKS5 connection to %d.%d.%d.%d:%d. (%d)",              (unsigned char)socksreq[4], (unsigned char)socksreq[5],              (unsigned char)socksreq[6], (unsigned char)socksreq[7], -            ((socksreq[8] << 8) | socksreq[9]), -            socksreq[1]); +            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]), +            (unsigned char)socksreq[1]);      }      else if(socksreq[3] == 3) {        failf(data,              "Can't complete SOCKS5 connection to %s:%d. (%d)",              hostname, -            ((socksreq[8] << 8) | socksreq[9]), -            socksreq[1]); +            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]), +            (unsigned char)socksreq[1]);      }      else if(socksreq[3] == 4) {        failf(data, @@ -696,8 +696,8 @@ CURLcode Curl_SOCKS5(const char *proxy_name,              (unsigned char)socksreq[14], (unsigned char)socksreq[15],              (unsigned char)socksreq[16], (unsigned char)socksreq[17],              (unsigned char)socksreq[18], (unsigned char)socksreq[19], -            ((socksreq[8] << 8) | socksreq[9]), -            socksreq[1]); +            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]), +            (unsigned char)socksreq[1]);      }      return CURLE_COULDNT_CONNECT;    }  | 
