generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

connect: Return the socket descriptor even on fail

Browse Source 
singleipconnect() did not return the open socket descriptor on some
errors, thereby sometimes causing a socket leak. This patch ensures
the socket is always returned.
This commit is contained in:
Björn Stenberg
2013-11-12 21:09:03 +01:00
committed by Steve Holme
parent 1f0616ea1a
commit ed1662c374
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/connect.c
View File

@@ -1027,6 +1027,8 @@ singleipconnect(struct connectdata *conn,
conn->bits.ipv6 = (addr.family == AF_INET6)?TRUE:FALSE; conn->bits.ipv6 = (addr.family == AF_INET6)?TRUE:FALSE;
#endif #endif
*sockp = sockfd;
if(-1 == rc) { if(-1 == rc) {
switch (error) { switch (error) {
case EINPROGRESS: case EINPROGRESS:
@@ -1040,7 +1042,6 @@ singleipconnect(struct connectdata *conn,
case EAGAIN: case EAGAIN:
#endif #endif
#endif #endif
*sockp = sockfd;
return CURLE_OK; return CURLE_OK;
default: default:
@@ -1053,8 +1054,6 @@ singleipconnect(struct connectdata *conn,
return CURLE_COULDNT_CONNECT; return CURLE_COULDNT_CONNECT;
} }
} }
else
*sockp = sockfd;
return CURLE_OK; return CURLE_OK;
} }