diff options
| author | wm4 <wm4@nowhere> | 2017-06-27 14:22:28 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-06-29 10:31:13 +0200 |
| commit | cd25d98bfa38c87bd857264e876cd8be42eb3678 (patch) | |
| tree | f721ae2930ac3ce823326592f986f4f4c20654e6 /stream/stream.c | |
| parent | 7eca787571aab982acaadee79abb0f40f9f14b6a (diff) | |
| download | mpv-cd25d98bfa38c87bd857264e876cd8be42eb3678.tar.bz2 mpv-cd25d98bfa38c87bd857264e876cd8be42eb3678.tar.xz | |
Avoid calling close(-1)
While this is perfectly OK on Unix, it causes annoying valgrind
warnings, and might be otherwise confusing to others.
On Windows, the runtime can actually abort the process if this is
called.
push.c part taken from a patch by Pedro Pombeiro.
Diffstat (limited to 'stream/stream.c')
| -rw-r--r-- | stream/stream.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/stream/stream.c b/stream/stream.c index d4dea4486f..ca17fa787f 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -885,8 +885,10 @@ struct mp_cancel { static void cancel_destroy(void *p) { struct mp_cancel *c = p; - close(c->wakeup_pipe[0]); - close(c->wakeup_pipe[1]); + if (c->wakeup_pipe[0] >= 0) { + close(c->wakeup_pipe[0]); + close(c->wakeup_pipe[1]); + } } struct mp_cancel *mp_cancel_new(void *talloc_ctx) |