github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

client: call certain external functions outside of client lock 

Fixes theoretical lock-order issues found by Coverity. Calling these
inside the log is unnecessary anyway, because they have their own
locking, and because mpv_detach_destroy() needs to be called by someone
who has exclusive access to the mpv_handle (it's basically a destructor
function). The lock order issues comes from the fact that they call back
into the client API implementation to broadcast events and such.
This commit is contained in:
wm4 2017-02-24 08:54:52 +01:00
parent 6f8c953042
commit eacf4a7d9b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
player/client.c
View File

@ -366,6 +366,9 @@ void mpv_detach_destroy(mpv_handle *ctx)
// causes a crash, block until all asynchronous requests were served.
mpv_wait_async_requests(ctx);
osd_set_external(ctx->mpctx->osd, ctx, 0, 0, NULL);
mp_input_remove_sections_by_owner(ctx->mpctx->input, ctx->name);
struct mp_client_api *clients = ctx->clients;
pthread_mutex_lock(&clients->lock);
@ -378,8 +381,6 @@ void mpv_detach_destroy(mpv_handle *ctx)
ctx->num_events--;
}
mp_msg_log_buffer_destroy(ctx->messages);
osd_set_external(ctx->mpctx->osd, ctx, 0, 0, NULL);
mp_input_remove_sections_by_owner(ctx->mpctx->input, ctx->name);
pthread_cond_destroy(&ctx->wakeup);
pthread_mutex_destroy(&ctx->wakeup_lock);
pthread_mutex_destroy(&ctx->lock);