From: Sviatoslav Chagaev <sviatoslav.chagaev@gmail.com>
Date: Tue, 10 Sep 2013 15:23:53 +0000 (+0300)
Subject: Fix file descriptor leak in _dbus_command_for_pid
X-Git-Tag: dbus-1.6.16~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a548141b172a078dd0073d718da3fb655821860a;p=thirdparty%2Fdbus.git

Fix file descriptor leak in _dbus_command_for_pid

Fix a file descriptor not being closed when an error codepath is taken.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69182
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
[more specific commit message -smcv]
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index 6cff3fe20..bbc3f3481 100644
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -1144,6 +1144,7 @@ _dbus_command_for_pid (unsigned long  pid,
                       "Failed to read from \"%s\": %s",
                       _dbus_string_get_const_data (&path),
                       _dbus_strerror (errno));      
+      _dbus_close (fd, NULL);
       goto fail;
     }