[GNUnet-SVN] [gnurl] 158/178: setup_transfer: deal with both sockets being -1

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit fe6b78b42dee1d33a2a225de6e42d0d922d4fe10
Author: Daniel Stenberg <address@hidden>
AuthorDate: Fri May 11 23:54:26 2018 +0200

    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.
---
 lib/transfer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/transfer.c b/lib/transfer.c
index 6bf95c576..131f2dc7c 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 {

-- 
To stop receiving notification emails like this one, please contact
address@hidden