Merge branch 'master' into release/0.9

* master: (87 commits)
  manpage: move --autosync description
  player: add --window-scale option
  player: flush decoder even if cover art is decoded
  player: don't show A/V desync message in non-sense situations
  w32_common: add more rounded-down frame rates
  w32_common: use the current monitor's refresh rate
  dxva2: fix broken build with gcc 5.1
  terminal: printf() is not signal-safe
  man: fix PDF build
  DOCS/mplayer-changes: Eleborate on joystick input
  osc: add nil check for element.eventresponder
  mp_image: remove some unused interlacing flags
  vf_vapoursynth: update _FieldBased semantics
  options: remove unneeded hack from command line parser
  manpage: document ff-index sub-property
  demux_mkv: limit timestamp fixing to 1ms max
  demux_mkv: attempt to fix rounded timestamps
  demux_mkv: move global options to the demuxer
  demux_mkv: better seeking after video end
  lua: add utils.format_json() function
  ...

1 files changed, 12 insertions, 1 deletions

diff --git a/osdep/subprocess-posix.c b/osdep/subprocess-posix.c
index c2120b2aa8..9d565f411e 100644
--- a/osdep/subprocess-posix.c
+++ b/osdep/subprocess-posix.c
@@ -20,6 +20,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <fcntl.h>
 #include <errno.h>
 #include <signal.h>
 
@@ -63,6 +64,7 @@ int mp_subprocess(char **args, struct mp_cancel *cancel, void *ctx,
     int status = -1;
     int p_stdout[2] = {-1, -1};
     int p_stderr[2] = {-1, -1};
+    int devnull = -1;
     pid_t pid = -1;
 
     if (on_stdout && mp_make_cloexec_pipe(p_stdout) < 0)
@@ -70,10 +72,16 @@ int mp_subprocess(char **args, struct mp_cancel *cancel, void *ctx,
     if (on_stderr && mp_make_cloexec_pipe(p_stderr) < 0)
         goto done;
 
+    devnull = open("/dev/null", O_RDONLY | O_CLOEXEC);
+    if (devnull < 0)
+        goto done;
+
     if (posix_spawn_file_actions_init(&fa))
         goto done;
     fa_destroy = true;
-    // redirect stdout and stderr
+    // redirect stdin/stdout/stderr
+    if (posix_spawn_file_actions_adddup2(&fa, devnull, 0))
+        goto done;
     if (p_stdout[1] >= 0 && posix_spawn_file_actions_adddup2(&fa, p_stdout[1], 1))
         goto done;
     if (p_stderr[1] >= 0 && posix_spawn_file_actions_adddup2(&fa, p_stderr[1], 2))
@@ -88,6 +96,8 @@ int mp_subprocess(char **args, struct mp_cancel *cancel, void *ctx,
     p_stdout[1] = -1;
     close(p_stderr[1]);
     p_stderr[1] = -1;
+    close(devnull);
+    devnull = -1;
 
     int *read_fds[2] = {&p_stdout[0], &p_stderr[0]};
     subprocess_read_cb read_cbs[2] = {on_stdout, on_stderr};
@@ -133,6 +143,7 @@ done:
     close(p_stdout[1]);
     close(p_stderr[0]);
     close(p_stderr[1]);
+    close(devnull);
 
     if (WIFEXITED(status) && WEXITSTATUS(status) != 127) {
         *error = NULL;