- Justin Fletcher fixed a file descriptor leak in the curl tool when trying to

  upload a file it couldn't open. Bug #1676581
  (http://curl.haxx.se/bug/view.cgi?id=1676581)

diff --git a/CHANGES b/CHANGES
index f47d35b3bc78babdf5f2cb7b85f23527f2329e24..a7466051b0ec953198442a92bc89e8e19287c4ba 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   Changelog
 
+Daniel (9 March 2007)
+- Justin Fletcher fixed a file descriptor leak in the curl tool when trying to
+  upload a file it couldn't open. Bug #1676581
+  (http://curl.haxx.se/bug/view.cgi?id=1676581)
+
 Dan F (9 March 2007)
 - Updated the test harness to check for protocol support before running each
   test, fixing KNOWN_BUGS #11.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 079d7d0ceb3d5f9ea6e77cdd27f3731e42bcc83f..636a0d91b0c5586860a82ebbb91ba2d272388694 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -58,6 +58,6 @@ advice from friends like these:
  Yang Tse, Manfred Schwarb, Michael Wallner, Jeff Pohlmeyer, Shmulik Regev,
  Rob Crittenden, Robert A. Monat, Dan Fandrich, Duncan Mac-Vicar Prett,
  Michal Marek, Robson Braga Araujo, Ian Turner, Linus Nielsen Feltzing,
- Ravi Pratap, Adam D. Moss, Jose Kahan, Hang Kin Lau
+ Ravi Pratap, Adam D. Moss, Jose Kahan, Hang Kin Lau, Justin Fletcher
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/src/main.c b/src/main.c
index fcc5192457ccac6c1ada75a8c4411ff4fc71fe9e..ae74550370371f8ce01b0c2dc12ca24600007065 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -3931,6 +3931,8 @@ operate(struct Configurable *config, int argc, char *argv[])
           infd=(FILE *) fopen(uploadfile, "rb");
           if (!infd || stat(uploadfile, &fileinfo)) {
             helpf("Can't open '%s'!\n", uploadfile);
+            if(infd)
+              fclose(infd);
             return CURLE_READ_ERROR;
           }
           infdfopen=TRUE;