Skip to content

M
mpd
Commit 8d5fa754 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output_thread: fix assertion failure due to race condition in OPEN

Change the assertion on "fail_timer==NULL" in OPEN to a runtime check. This assertion crashed when the output thread failed while the player thread was calling audio_output_open().
parent 2ee047a1
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
NEWS
View file @ 8d5fa754
ver 0.15.14 (2010/??/??) ver 0.15.14 (2010/??/??)
* output_thread: fix assertion failure due to race condition in OPEN
ver 0.15.13 (2010/10/10) ver 0.15.13 (2010/10/10)
* output_thread: fix race condition after CANCEL command * output_thread: fix race condition after CANCEL command
......
src/output_thread.c
View file @ 8d5fa754
...@@ -197,10 +197,18 @@ static gpointer audio_output_task(gpointer arg) ...@@ -197,10 +197,18 @@ static gpointer audio_output_task(gpointer arg)
case AO_COMMAND_OPEN: case AO_COMMAND_OPEN:
assert(!ao->open); assert(!ao->open);
assert(ao->fail_timer == NULL);
assert(ao->pipe != NULL); assert(ao->pipe != NULL);
assert(ao->chunk == NULL); assert(ao->chunk == NULL);
if (ao->fail_timer != NULL) {
/* this can only happen when this
output thread fails while
audio_output_open() is run in the
player thread */
g_timer_destroy(ao->fail_timer);
ao->fail_timer = NULL;
}
error = NULL; error = NULL;
ret = ao_plugin_open(ao->plugin, ao->data, ret = ao_plugin_open(ao->plugin, ao->data,
&ao->out_audio_format, &ao->out_audio_format,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment