romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 23:51:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

ftp: return better on OOM in two places

Browse source 
Found with strict torture testing.

Closes #20099
This commit is contained in:
Daniel Stenberg 2025-12-25 23:17:24 +01:00
parent a585cc35e5
commit abcb10f3ac
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/ftp.c
View file

@ -1941,7 +1941,8 @@ static CURLcode ftp_state_pasv_resp(struct Curl_easy *data,
CURL_CF_SSL_ENABLE : CURL_CF_SSL_DISABLE);
if(result) {
if(ftpc->count1 == 0 && ftpcode == 229) {
if((result != CURLE_OUT_OF_MEMORY) &&
(ftpc->count1 == 0) && (ftpcode == 229)) {
curlx_free(newhost);
return ftp_epsv_disable(data, ftpc, conn);
}
@ -3552,6 +3553,8 @@ static CURLcode ftp_do_more(struct Curl_easy *data, int *completep)
if(conn->cfilter[SECONDARYSOCKET]) {
bool is_eptr = Curl_conn_is_tcp_listen(data, SECONDARYSOCKET);
result = Curl_conn_connect(data, SECONDARYSOCKET, FALSE, &connected);
if(result == CURLE_OUT_OF_MEMORY)
return result;
if(result || (!connected && !is_eptr &&
!Curl_conn_is_ip_connected(data, SECONDARYSOCKET))) {
if(result && !is_eptr && (ftpc->count1 == 0)) {