moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

connect: Close open but unconnected socket in singleipconnect() 

singleipconnect() could return the file descriptor of an open socket
even though the function returned a CURLE_COULDNT_CONNECT error code
from commit ed1662c374 and 02fbc26d59.

This could cause tests 19, 704 and 1233 to fail on FreeBSD, AIX and
Solaris.
This commit is contained in:
Steve Holme 2013-11-16 22:56:11 +00:00
parent b56d7cda74
commit 2c7a5578e1
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/connect.c
View File

@ -562,6 +562,7 @@ static CURLcode trynextip(struct connectdata *conn,
while(ai && ai->ai_family != family)
ai = ai->ai_next;
if(ai) {
rc = singleipconnect(conn, ai, &conn->tempsock[tempindex]);
conn->tempaddr[tempindex] = ai;
@ -1027,10 +1028,8 @@ singleipconnect(struct connectdata *conn,
conn->bits.ipv6 = (addr.family == AF_INET6)?TRUE:FALSE;
#endif
*sockp = sockfd;
if(-1 == rc) {
switch (error) {
switch(error) {
case EINPROGRESS:
case EWOULDBLOCK:
#if defined(EAGAIN)
@ -1042,7 +1041,8 @@ singleipconnect(struct connectdata *conn,
case EAGAIN:
#endif
#endif
return CURLE_OK;
res = CURLE_OK;
break;
default:
/* unknown error, fallthrough and try another address! */
@ -1051,11 +1051,15 @@ singleipconnect(struct connectdata *conn,
data->state.os_errno = error;
/* connect failed */
return CURLE_COULDNT_CONNECT;
Curl_closesocket(conn, sockfd);
res = CURLE_COULDNT_CONNECT;
}
}
return CURLE_OK;
if(!res)
*sockp = sockfd;
return res;
}
/*