aboutsummaryrefslogtreecommitdiff
path: root/src/mixer
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-11-07 18:55:16 +0100
committerMax Kellermann <max@duempel.org>2009-11-07 18:55:16 +0100
commite3af0032b236dc52d4a74c4d740e57a1f6d520aa (patch)
tree3984233a9b639e71ad80b4f6598539de3a27a008 /src/mixer
parent9b21152600071ec46c021c8ba3b2ef69c90f039f (diff)
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/mixer')
-rw-r--r--src/mixer/oss_mixer_plugin.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mixer/oss_mixer_plugin.c b/src/mixer/oss_mixer_plugin.c
index 4e169bbc..028786ae 100644
--- a/src/mixer/oss_mixer_plugin.c
+++ b/src/mixer/oss_mixer_plugin.c
@@ -19,6 +19,7 @@
#include "mixer_api.h"
#include "output_api.h"
+#include "fd_util.h"
#include <glib.h>
@@ -122,7 +123,7 @@ oss_mixer_open(struct mixer *data, GError **error_r)
{
struct oss_mixer *om = (struct oss_mixer *) data;
- om->device_fd = open(om->device, O_RDONLY);
+ om->device_fd = open_cloexec(om->device, O_RDONLY);
if (om->device_fd < 0) {
g_set_error(error_r, oss_mixer_quark(), errno,
"failed to open %s: %s",