moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

ftp.c: fix socket leak torture tests detected 2011-08-30

Browse Source 
Also fix inappropriate error handling when sending ftp EPRT or PORT commands.
This commit is contained in:
Yang Tse 2011-09-12 15:16:07 +02:00
parent 587ed3234b
commit 4e9a1c5bba
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ftp.c
View File

@ -1000,8 +1000,14 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
result = Curl_pp_sendf(&ftpc->pp, "%s |%d|%s|%hu|", mode[fcmd],
sa->sa_family == AF_INET?1:2,
myhost, port);
if(result)
if(result) {
Curl_closesocket(conn, portsock);
/* don't retry using PORT */
ftpc->count1 = PORT;
/* bail out */
state(conn, FTP_STOP);
return result;
}
break;
}
else if(PORT == fcmd) {
@ -1021,8 +1027,12 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
snprintf(dest, 20, ",%d,%d", (int)(port>>8), (int)(port&0xff));
result = Curl_pp_sendf(&ftpc->pp, "%s %s", mode[fcmd], tmp);
if(result)
if(result) {
Curl_closesocket(conn, portsock);
/* bail out */
state(conn, FTP_STOP);
return result;
}
break;
}
}