summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-12-03 10:08:51 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-03 10:08:51 +0000
commit1d93a1663bb79677fcbd5603f94095f9ddbeea16 (patch)
tree3d2196d0a0d3ae8ef956da17078bb1bc338a1868
parent048ec58bfd4b96a8bcc7271493424c3b5d95a0a3 (diff)
Fix double-free in curl uploader.
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/curl_uploader.cc1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5692c86fa..6546f8f29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-03 Carl Hetherington <cth@carlh.net>
+
+ * Fix crash on uploading to TMS via FTP.
+
2015-12-02 Carl Hetherington <cth@carlh.net>
* Version 2.6.0 released.
diff --git a/src/lib/curl_uploader.cc b/src/lib/curl_uploader.cc
index d996fde53..11c389307 100644
--- a/src/lib/curl_uploader.cc
+++ b/src/lib/curl_uploader.cc
@@ -92,6 +92,7 @@ CurlUploader::upload_file (boost::filesystem::path from, boost::filesystem::path
}
fclose (_file);
+ _file = 0;
}
size_t