leak hunt

diff --git a/swift.cpp b/swift.cpp
index ee9f13c4ea5c64a6337ccfbabbf444f05611d858..a97c33c4fd52b020beeb9f31afdcbf2b52348032 100644 (file)
--- a/swift.cpp
+++ b/swift.cpp
@@ -127,8 +127,7 @@ int      swift::Open (const char* filename, const Sha1Hash& hash) {
 
 
 void    swift::Close (int fd) {
-    // FIXME delete all channels
-    if (fd>FileTransfer::files.size() && FileTransfer::files[fd])
+    if (fd<FileTransfer::files.size() && FileTransfer::files[fd])
         delete FileTransfer::files[fd];
 }
 

diff --git a/transfer.cpp b/transfer.cpp
index 70c7a0e2bf074cdfd72346441e33b2e9ed0e67e4..e769bec1eeb715a92949bf677400fbd0fb9dc0eb 100644 (file)
--- a/transfer.cpp
+++ b/transfer.cpp
@@ -50,6 +50,7 @@ FileTransfer::~FileTransfer ()
 {
     Channel::CloseTransfer(this);
     files[fd()] = NULL;
+    delete picker_;
 }