luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make cancellable pipe fds close-on-exec

Browse Source 
GCancellable is purely an in-process thing, so ensure that no cancellable
fds accidentally leak to child processes.
This commit is contained in:
Alexander Larsson 2009-05-15 10:42:28 +02:00
parent 23424e7bcb
commit a48fc53251
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gio/gcancellable.c
View File

@ -188,6 +188,20 @@ set_fd_nonblocking (int fd)
#endif #endif
} }
static void
set_fd_close_exec (int fd)
{
int flags;
flags = fcntl (fd, F_GETFD, 0);
if (flags != -1 && (flags & FD_CLOEXEC) == 0)
{
flags |= FD_CLOEXEC;
fcntl (fd, F_SETFD, flags);
}
}
static void static void
g_cancellable_open_pipe (GCancellable *cancellable) g_cancellable_open_pipe (GCancellable *cancellable)
{ {
@ -198,6 +212,8 @@ g_cancellable_open_pipe (GCancellable *cancellable)
*/ */
set_fd_nonblocking (cancellable->cancel_pipe[0]); set_fd_nonblocking (cancellable->cancel_pipe[0]);
set_fd_nonblocking (cancellable->cancel_pipe[1]); set_fd_nonblocking (cancellable->cancel_pipe[1]);
set_fd_close_exec (cancellable->cancel_pipe[0]);
set_fd_close_exec (cancellable->cancel_pipe[1]);
} }
else else
g_warning ("Failed to create pipe for GCancellable. Out of file descriptors?"); g_warning ("Failed to create pipe for GCancellable. Out of file descriptors?");