diff options
| author | Michel HERMIER <hermier@frugalware.org> | 2012-11-09 15:44:43 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-11-09 16:02:01 +0000 |
| commit | 9a9b0e2736378d1a8961fb264d7314e921231e8e (patch) | |
| tree | 349e697a2b97d01bb9b788882a82f9825bb169e9 | |
| parent | e516a31f59abbbf7cbfcc3396ef41162188a7f5c (diff) | |
| download | dbus-9a9b0e2736378d1a8961fb264d7314e921231e8e.tar.gz | |
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 <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | dbus/dbus-sysdeps-util-unix.c | 1 | ||||
| -rw-r--r-- | tools/dbus-launch.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index 76423ab8..6cff3fe2 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 1ec9ae59..2a9dabfa 100644 --- a/tools/dbus-launch.c +++ b/tools/dbus-launch.c @@ -633,6 +633,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 { |