romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-30 15:07:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

ftp: do not strdup DATA hostname

Browse source 
Since `newhost` is already allocated, we do not need to strdup()
it. Just assign and NULL the reference.

Closes #20953
This commit is contained in:
Stefan Eissing 2026-03-17 13:13:04 +01:00 • committed by Daniel Stenberg
parent 32500f12c4
commit 2e2d021d97
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/ftp.c
View file

@ -2196,6 +2196,12 @@ static CURLcode ftp_state_pasv_resp(struct Curl_easy *data,
}
}
DEBUGASSERT(newhost);
curlx_free(conn->secondaryhostname);
conn->secondary_port = newport;
conn->secondaryhostname = newhost;
newhost = NULL;
result = Curl_conn_setup(data, conn, SECONDARYSOCKET, dns,
conn->bits.ftp_use_data_ssl ?
CURL_CF_SSL_ENABLE : CURL_CF_SSL_DISABLE);
@ -2203,10 +2209,8 @@ static CURLcode ftp_state_pasv_resp(struct Curl_easy *data,
if(result) {
if((result != CURLE_OUT_OF_MEMORY) &&
(ftpc->count1 == 0) && (ftpcode == 229)) {
curlx_free(newhost);
return ftp_epsv_disable(data, ftpc, conn);
result = ftp_epsv_disable(data, ftpc, conn);
}
goto error;
}
@ -2223,18 +2227,11 @@ static CURLcode ftp_state_pasv_resp(struct Curl_easy *data,
*/
char buf[256];
Curl_printable_address(dns->addr, buf, sizeof(buf));
infof(data, "Connecting to %s (%s) port %d", newhost, buf, connectport);
infof(data, "Connecting to %s (%s) port %d",
conn->secondaryhostname, buf, connectport);
}
#endif
curlx_free(conn->secondaryhostname);
conn->secondary_port = newport;
conn->secondaryhostname = curlx_strdup(newhost);
if(!conn->secondaryhostname) {
result = CURLE_OUT_OF_MEMORY;
goto error;
}
conn->bits.do_more = TRUE;
ftp_state(data, ftpc, FTP_STOP); /* this phase is completed */