oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output_thread: fix assertion failure due to race condition in OPEN

Browse Source 
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().
This commit is contained in:
Max Kellermann 2010-11-04 21:30:16 +01:00
parent 2ee047a1dd
commit 8d5fa754e8
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,5 +1,5 @@
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

10
src/output_thread.c
View File

@ -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,