Safely encapsulate fdopen within DBus::FileDescriptor to prevent leaks

diff --git a/client/proxy/commands.cc b/client/proxy/commands.cc
index 4fbe863ec773bc44b31fe80813762130f07c5e7d..3279d3373d6c8c28bc055e4e3da5e975a832e36d 100644 (file)
--- a/client/proxy/commands.cc
+++ b/client/proxy/commands.cc
@@ -554,7 +554,7 @@ command_get_xfiles_by_pipe(DBus::Connection& conn, const string& config_name, un
 
     vector<XFile> files;
 
-    FILE* fin = fdopen(fd.get_fd(), "r");
+    FILE* fin = fd.fdopen("r");
     if (!fin)
        SN_THROW(IOErrorException("reading pipe failed, fdopen failed: " + stringerror(errno)));
 

diff --git a/dbus/DBusPipe.cc b/dbus/DBusPipe.cc
index 691975eb4bf4da08fe8ba8869b2b8a855096e5bb..74eb680f5e3b3f8494081bff0caa78431856e5b7 100644 (file)
--- a/dbus/DBusPipe.cc
+++ b/dbus/DBusPipe.cc
@@ -65,6 +65,14 @@ namespace DBus
        return marshaller;
     }
 
+    FILE*
+    FileDescriptor::fdopen(const char* mode)
+    {
+        FILE* ret = ::fdopen(_fd, mode);
+        if (ret)
+            _fd = -1;
+        return ret;
+    }
 
     Pipe::Pipe()
     {

diff --git a/dbus/DBusPipe.h b/dbus/DBusPipe.h
index 13a15a6124b7e84814abdf65944867994614a2f4..63bacf6aeb848041b6de2a0612bfff20e227cc77 100644 (file)
--- a/dbus/DBusPipe.h
+++ b/dbus/DBusPipe.h
@@ -44,6 +44,8 @@ namespace DBus
        int get_fd() const { return _fd; }
        void set_fd(int fd) { _fd = fd; }
 
+       FILE* fdopen(const char* mode);
+
     private:
 
        int _fd = -1;

diff --git a/server/FilesTransferTask.cc b/server/FilesTransferTask.cc
index b708e23d8ac86cecaa25d38181ae3f50162a91e8..a0f3d66b1f400ddaaae83ff18bb2d81866037037 100644 (file)
--- a/server/FilesTransferTask.cc
+++ b/server/FilesTransferTask.cc
@@ -33,7 +33,7 @@ FilesTransferTask::FilesTransferTask(const Files& files)
 void
 FilesTransferTask::run()
 {
-    FILE* fout = fdopen(get_write_end().get_fd(), "w");
+    FILE* fout = get_write_end().fdopen("w");
     if (!fout)
        SN_THROW(StreamException());