diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-13 14:04:45 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-13 14:04:45 +0100 |
commit | ca99f0142b0bf9b5c5331065c3a51ba1c9e54478 (patch) | |
tree | 8a33e570d26ded601e87fe6caddf0a118baf81cf /dbus/dbus-sysdeps-util-unix.c | |
parent | dd71688e5d5fe2bdca8b3c0b090a40d053100a4f (diff) | |
parent | 1c95955cbc6e816dd50a9d66846c11b44d703a1f (diff) | |
download | dbus-ca99f0142b0bf9b5c5331065c3a51ba1c9e54478.tar.gz |
Merge branch 'dbus-1.6'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'dbus/dbus-sysdeps-util-unix.c')
-rw-r--r-- | dbus/dbus-sysdeps-util-unix.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index 631c199f..0d8a66c7 100644 --- a/dbus/dbus-sysdeps-util-unix.c +++ b/dbus/dbus-sysdeps-util-unix.c @@ -1157,6 +1157,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; } |