mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

sink, source: Don't finish move if unlink happens after pa_*_move_all_start()

Browse source 
When a sink input was unlinked between the calls to pa_sink_move_all_start() and
pa_sink_move_all_finish(), pa_sink_move_all_finish() tried to finish the move
of the already unlinked sink input, which lead to an assertion in
pa_sink_input_finish_move(). The same applies for the source side.

This patch fixes the problem by checking the state of the sink input or
source output in pa_*_move_all_finish().

Bug report: https://bugs.freedesktop.org/show_bug.cgi?id=103752
This commit is contained in:
Georg Chini 2017-12-03 22:29:09 +01:00
parent e083357b88
commit 59d264ac56
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pulsecore/sink.c
View file

@ -920,9 +920,11 @@ void pa_sink_move_all_finish(pa_sink *s, pa_queue *q, bool save) {
pa_assert(q);
while ((i = PA_SINK_INPUT(pa_queue_pop(q)))) {
if (PA_SINK_INPUT_IS_LINKED(i->state)) {
if (pa_sink_input_finish_move(i, s, save) < 0)
pa_sink_input_fail_move(i);
}
pa_sink_input_unref(i);
}

2
src/pulsecore/source.c
View file

@ -860,9 +860,11 @@ void pa_source_move_all_finish(pa_source *s, pa_queue *q, bool save) {
pa_assert(q);
while ((o = PA_SOURCE_OUTPUT(pa_queue_pop(q)))) {
if (PA_SOURCE_OUTPUT_IS_LINKED(o->state)) {
if (pa_source_output_finish_move(o, s, save) < 0)
pa_source_output_fail_move(o);
}
pa_source_output_unref(o);
}