From d989aa520b856a8558682bc4051ef213d0f8d43a Mon Sep 17 00:00:00 2001 From: Michel HERMIER Date: Fri, 9 Nov 2012 15:44:43 +0000 Subject: Don't leak temporary fds pointing to /dev/null Bug: https://bugs.freedesktop.org/show_bug.cgi?id=56927 [commit message added -smcv] Reviewed-by: Simon McVittie --- dbus/dbus-sysdeps-util-unix.c | 1 + tools/dbus-launch.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index d57e6aad..4f81e6a6 100644 --- a/dbus/dbus-sysdeps-util-unix.c +++ b/dbus/dbus-sysdeps-util-unix.c @@ -123,6 +123,7 @@ _dbus_become_daemon (const DBusString *pidfile, dup2 (dev_null_fd, 2); else _dbus_verbose ("keeping stderr open due to DBUS_DEBUG_OUTPUT\n"); + close (dev_null_fd); } if (!keep_umask) diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c index bbaac2c3..bb639a11 100644 --- a/tools/dbus-launch.c +++ b/tools/dbus-launch.c @@ -583,6 +583,7 @@ babysit (int exit_with_session, s = getenv ("DBUS_DEBUG_OUTPUT"); if (s == NULL || *s == '\0') dup2 (dev_null_fd, 2); + close (dev_null_fd); } else { -- cgit v1.2.3