Fixed an out of memory problem that caused torture test failures in tests
706 and 707.
This commit is contained in:
Родитель
0994d7811f
Коммит
29ec219b82
4
CHANGES
4
CHANGES
|
@ -6,6 +6,10 @@
|
|||
|
||||
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)
|
||||
- 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
|
||||
|
|
10
lib/ftp.c
10
lib/ftp.c
|
@ -1825,6 +1825,11 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
|
|||
connectport =
|
||||
(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 {
|
||||
/* normal, direct, ftp connection */
|
||||
|
@ -1833,11 +1838,12 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
|
|||
/* BLOCKING */
|
||||
rc = Curl_wait_for_resolv(conn, &addr);
|
||||
|
||||
connectport = newport; /* we connect to the remote port */
|
||||
|
||||
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;
|
||||
}
|
||||
connectport = newport; /* we connect to the remote port */
|
||||
}
|
||||
|
||||
result = Curl_connecthost(conn,
|
||||
|
|
Загрузка…
Ссылка в новой задаче