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

Fixed an out of memory problem that caused torture test failures in tests

Browse Source 
706 and 707.
This commit is contained in:
Dan Fandrich 2008-09-02 23:12:00 +00:00
parent 0994d7811f
commit 29ec219b82
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -6,6 +6,10 @@
Changelog Changelog
Daniel Fandrich (2 Sep 2008)
- Fixed an out of memory problem that caused torture test failures in tests
706 and 707.
Daniel Stenberg (2 Sep 2008) Daniel Stenberg (2 Sep 2008)
- Keith Mok added supported_protocols and supported_features to the pkg-config - Keith Mok added supported_protocols and supported_features to the pkg-config
file for libcurl, and while doing that fix he unified with curl-config.in file for libcurl, and while doing that fix he unified with curl-config.in

10
lib/ftp.c
View File

@ -1825,6 +1825,11 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
connectport = connectport =
(unsigned short)conn->port; /* we connect to the proxy's port */ (unsigned short)conn->port; /* we connect to the proxy's port */
if(!addr) {
failf(data, "Can't resolve proxy host %s:%d",
conn->proxy.name, connectport);
return CURLE_FTP_CANT_GET_HOST;
}
} }
else { else {
/* normal, direct, ftp connection */ /* normal, direct, ftp connection */
@ -1833,11 +1838,12 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
/* BLOCKING */ /* BLOCKING */
rc = Curl_wait_for_resolv(conn, &addr); rc = Curl_wait_for_resolv(conn, &addr);
connectport = newport; /* we connect to the remote port */
if(!addr) { if(!addr) {
failf(data, "Can't resolve new host %s:%d", newhost, newport); failf(data, "Can't resolve new host %s:%d", newhost, connectport);
return CURLE_FTP_CANT_GET_HOST; return CURLE_FTP_CANT_GET_HOST;
} }
connectport = newport; /* we connect to the remote port */
} }
result = Curl_connecthost(conn, result = Curl_connecthost(conn,