From: Alban Crequy <alban.crequy@collabora.co.uk>
Date: Fri, 27 Jun 2014 15:33:39 +0000 (+0100)
Subject: dbus-monitor: do not leak file descriptors from fd-passing
X-Git-Tag: dbus-1.9.0~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb4584d5c53fe63d7efdf22639d58022ed853305;p=thirdparty%2Fdbus.git

dbus-monitor: do not leak file descriptors from fd-passing

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=80603
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c
index e0dd2da60..320abd6fe 100644
--- a/tools/dbus-print-message.c
+++ b/tools/dbus-print-message.c
@@ -352,6 +352,13 @@ print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
 	    int fd;
 	    dbus_message_iter_get_basic (iter, &fd);
 	    printf ("unix fd %d\n", fd);
+
+            /* dbus_message_iter_get_basic() duplicated the fd, we need to
+             * close it after use. The original fd will be closed when the
+             * DBusMessage is released.
+             */
+            close (fd);
+
 	    break;
 	  }