- 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.

diff --git a/CHANGES b/CHANGES
index c985a4e96726feb921d6d87b63ac4c651bb77ef3..2b26a051e0464e329155a2caf3d35123fb54b42f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 91b5b67d18aa90a337832e3869480f82c4a8f181..6388ea575d8faa06e6c825eeccbc56e059fd7e25 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -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)

diff --git a/lib/ftp.c b/lib/ftp.c
index ebd04f954a28ec6a1c8c9fc0bd46898828d63262..0bd07710ddb453cf8c067c46271251a7abf79e60 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -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 &&