From: Anders Bakken <agbakken@gmail.com>
Date: Mon, 16 Nov 2015 20:50:41 +0000 (-0800)
Subject: getconnectinfo: Don't call recv(2) if socket == -1
X-Git-Tag: curl-7_46_0~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a72207ecf039e4c36abeaf64ba00ef36522f3f73;p=thirdparty%2Fcurl.git

getconnectinfo: Don't call recv(2) if socket == -1

Closes #528
---

diff --git a/lib/connect.c b/lib/connect.c
index ece6cf3f65..88041dd806 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -1242,10 +1242,10 @@ curl_socket_t Curl_getconnectinfo(struct SessionHandle *data,
     }
 /* Minix 3.1 doesn't support any flags on recv; just assume socket is OK */
 #ifdef MSG_PEEK
-    else {
+    else if(sockfd != CURL_SOCKET_BAD) {
       /* use the socket */
       char buf;
-      if(recv((RECV_TYPE_ARG1)c->sock[FIRSTSOCKET], (RECV_TYPE_ARG2)&buf,
+      if(recv((RECV_TYPE_ARG1)sockfd, (RECV_TYPE_ARG2)&buf,
               (RECV_TYPE_ARG3)1, (RECV_TYPE_ARG4)MSG_PEEK) == 0) {
         return CURL_SOCKET_BAD;   /* FIN received */
       }