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/oss_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 '')
-rw-r--r-- | src/output/oss_plugin.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/output/oss_plugin.c b/src/output/oss_plugin.c index 258fbfa9d..f308c293e 100644 --- a/src/output/oss_plugin.c +++ b/src/output/oss_plugin.c @@ -17,8 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../output_api.h" +#include "output_api.h" #include "mixer_list.h" +#include "fd_util.h" #include <glib.h> @@ -343,7 +344,9 @@ oss_output_test_default_device(void) int fd, i; for (i = G_N_ELEMENTS(default_devices); --i >= 0; ) { - if ((fd = open(default_devices[i], O_WRONLY)) >= 0) { + fd = open_cloexec(default_devices[i], O_WRONLY); + + if (fd >= 0) { close(fd); return true; } @@ -516,7 +519,8 @@ oss_open(struct oss_data *od, GError **error) { bool success; - if ((od->fd = open(od->device, O_WRONLY)) < 0) { + od->fd = open_cloexec(od->device, O_WRONLY); + if (od->fd < 0) { g_set_error(error, oss_output_quark(), errno, "Error opening OSS device \"%s\": %s", od->device, strerror(errno)); |