Attachment 69822 Details for Bug 56927 – Proposal patch to close leaked fd to /dev/null for some products.

[patch] Proposal patch to close leaked fd to /dev/null for some products.

fdleak.patch (text/plain), 1.73 KB, created by Michel HERMIER on 2012-11-09 15:22:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel HERMIER

Created: 2012-11-09 15:22:39 UTC

Size: 1.73 KB

patch

obsolete

>diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
>index 55743b1..b50167d 100644
>--- a/dbus/dbus-sysdeps-unix.c
>+++ b/dbus/dbus-sysdeps-unix.c
>@@ -3300,17 +3300,16 @@ _read_subprocess_line_argv (const char *progpath,
>       /* set-up stdXXX */
>       close (result_pipe[READ_END]);
>       close (errors_pipe[READ_END]);
>-      close (0);                /* close stdin */
>-      close (1);                /* close stdout */
>-      close (2);                /* close stderr */
> 
>-      if (dup2 (fd, 0) == -1)
>+      if (dup2 (fd, 0) == -1) /* setup stdin */
>         _exit (1);
>-      if (dup2 (result_pipe[WRITE_END], 1) == -1)
>+      if (dup2 (result_pipe[WRITE_END], 1) == -1) /* setup stdout */
>         _exit (1);
>-      if (dup2 (errors_pipe[WRITE_END], 2) == -1)
>+      if (dup2 (errors_pipe[WRITE_END], 2) == -1) /* setup stderr */
>         _exit (1);
> 
>+      close (fd);
>+
>       _dbus_close_all ();
> 
>       sigprocmask (SIG_SETMASK, &old_set, NULL);
>diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
>index 76423ab..6cff3fe 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 1ec9ae5..2a9dabf 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
>     {

Actions: View | Splinter Review

Attachments on bug 56927: 69822

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.