diff options
author | wm4 <wm4@nowhere> | 2016-09-21 15:55:34 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-09-21 17:34:55 +0200 |
commit | 14c232bdbfbb16f427632d579430fa1a522f7f73 (patch) | |
tree | 3e5cf05ca68f71f79d9467c1ce482b2feeb56a29 /player/main.c | |
parent | 47f3cc7e6bf78609551312f84c93cccf194a5930 (diff) | |
download | mpv-14c232bdbfbb16f427632d579430fa1a522f7f73.tar.bz2 mpv-14c232bdbfbb16f427632d579430fa1a522f7f73.tar.xz |
client API: fix init/destruction race conditions
mp_new_client() blatantly accessed some mutex-protected state outside of
the mutex.
The destruction code is in theory OK, but with changes in the following
commits it'll be a bit hard to guarantee that it stays this way. Add a
simple flag that makes adding new clients impossible, so that having no
clients after shutdown_clients() remains guaranteed.
Diffstat (limited to 'player/main.c')
-rw-r--r-- | player/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/player/main.c b/player/main.c index b4371ed1fa..c3488fc60c 100644 --- a/player/main.c +++ b/player/main.c @@ -152,20 +152,20 @@ void mp_print_version(struct mp_log *log, int always) static void shutdown_clients(struct MPContext *mpctx) { - while (mpctx->clients && mp_clients_num(mpctx)) { + mp_client_enter_shutdown(mpctx); + while (mp_clients_num(mpctx)) { mp_client_broadcast_event(mpctx, MPV_EVENT_SHUTDOWN, NULL); - mp_dispatch_queue_process(mpctx->dispatch, 0); mp_wait_events(mpctx); } } void mp_destroy(struct MPContext *mpctx) { + shutdown_clients(mpctx); + mp_uninit_ipc(mpctx->ipc_ctx); mpctx->ipc_ctx = NULL; - shutdown_clients(mpctx); - uninit_audio_out(mpctx); uninit_video_out(mpctx); |