From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 11 May 2018 21:54:26 +0000 (+0200)
Subject: setup_transfer: deal with both sockets being -1
X-Git-Tag: curl-7_60_0~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe6b78b42dee1d33a2a225de6e42d0d922d4fe10;p=thirdparty%2Fcurl.git

setup_transfer: deal with both sockets being -1

Detected by Coverity; CID 1435559.  Follow-up to f8d608f38d00. It would
index the array with -1 if neither index was a socket.
---

diff --git a/lib/transfer.c b/lib/transfer.c
index 6bf95c576f..131f2dc7c0 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -2021,7 +2021,8 @@ Curl_setup_transfer(
   if(conn->bits.multiplex || conn->httpversion == 20) {
     /* when multiplexing, the read/write sockets need to be the same! */
     conn->sockfd = sockindex == -1 ?
-      conn->sock[writesockindex] : conn->sock[sockindex];
+      ((writesockindex == -1 ? CURL_SOCKET_BAD : conn->sock[writesockindex])) :
+      conn->sock[sockindex];
     conn->writesockfd = conn->sockfd;
   }
   else {