diff options
| author | Max Kellermann <max@duempel.org> | 2009-11-07 18:55:16 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-11-07 18:55:16 +0100 |
| commit | e3af0032b236dc52d4a74c4d740e57a1f6d520aa (patch) | |
| tree | 3984233a9b639e71ad80b4f6598539de3a27a008 /src/output/httpd_output_plugin.c | |
| parent | 9b21152600071ec46c021c8ba3b2ef69c90f039f (diff) | |
| download | mpd-e3af0032b236dc52d4a74c4d740e57a1f6d520aa.tar.gz mpd-e3af0032b236dc52d4a74c4d740e57a1f6d520aa.tar.xz mpd-e3af0032b236dc52d4a74c4d740e57a1f6d520aa.zip | |
set the close-on-exec flag on all file descriptors
Added the "fd_util" library, which attempts to use the new thread-safe
Linux system calls pipe2(), accept4() and the options O_CLOEXEC,
SOCK_CLOEXEC. Without these, it falls back to FD_CLOEXEC, which is
not thread safe.
This is particularly important for the "pipe" output plugin (and
others, such as JACK/PulseAudio), because we were heavily leaking file
descriptors to child processes.
Diffstat (limited to 'src/output/httpd_output_plugin.c')
| -rw-r--r-- | src/output/httpd_output_plugin.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/output/httpd_output_plugin.c b/src/output/httpd_output_plugin.c index 5b0331257..6d5e99c57 100644 --- a/src/output/httpd_output_plugin.c +++ b/src/output/httpd_output_plugin.c @@ -25,6 +25,7 @@ #include "socket_util.h" #include "page.h" #include "icy_server.h" +#include "fd_util.h" #include <assert.h> @@ -187,14 +188,14 @@ httpd_listen_in_event(G_GNUC_UNUSED GIOChannel *source, struct httpd_output *httpd = data; int fd; struct sockaddr_storage sa; - socklen_t sa_length = sizeof(sa); + size_t sa_length = sizeof(sa); g_mutex_lock(httpd->mutex); /* the listener socket has become readable - a client has connected */ - fd = accept(httpd->fd, (struct sockaddr*)&sa, &sa_length); + fd = accept_cloexec(httpd->fd, (struct sockaddr*)&sa, &sa_length); if (fd >= 0) { /* can we allow additional client */ if (httpd->open && |