mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-18 14:04:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Kamil Dudka brought the patch from the Redhat bug entry

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=427966 which was libcurl closing
  a bad file descriptor when closing down the FTP data connection.  Caolan
  McNamara seems to be the original author of it.
This commit is contained in:
Daniel Stenberg 2009-05-19 20:54:31 +00:00
parent e3ead9f585
commit de7a14003c
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -6,6 +6,12 @@
Changelog
Daniel Stenberg (19 May 2009)
- Kamil Dudka brought the patch from the Redhat bug entry
https://bugzilla.redhat.com/show_bug.cgi?id=427966 which was libcurl closing
a bad file descriptor when closing down the FTP data connection. Caolan
McNamara seems to be the original author of it.
Version 7.19.5 (18 May 2009)
Daniel Stenberg (17 May 2009)

4
RELEASE-NOTES
View File

@ -13,7 +13,7 @@ This release includes the following changes:
This release includes the following bugfixes:
o
o crash on bad socket close with FTP
This release includes the following known bugs:
@ -22,6 +22,6 @@ This release includes the following known bugs:
This release would not have looked like this without help, code, reports and
advice from friends like these:
Kamil Dudka, Caolan McNamara
Thanks! (and sorry if I forgot to mention someone)

7
lib/ftp.c
View File

@ -3251,9 +3251,10 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status,
/* Note that we keep "use" set to TRUE since that (next) connection is
still requested to use SSL */
}
sclose(conn->sock[SECONDARYSOCKET]);
conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD;
if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET]) {
sclose(conn->sock[SECONDARYSOCKET]);
conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD;
}
}
if((ftp->transfer == FTPTRANSFER_BODY) && ftpc->ctl_valid &&