mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

loopback: Fix segfault in may_move_to() callbacks

Browse source 
The sink input may_move_to() callbacks can be called while the source
output is not connected to any source (i.e. is currently moving too),
and vice versa.

Thanks to Frédéric Dalleau for reporting this bug.
This commit is contained in:
Tanu Kaskinen 2013-03-14 22:07:12 +02:00
parent 2135b2b34f
commit f8b57af2c8
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/module-loopback.c
View file

@ -379,13 +379,16 @@ static void source_output_kill_cb(pa_source_output *o) {
} }
/* Called from main thread */ /* Called from main thread */
static pa_bool_t source_output_may_move_to_cb(pa_source_output *o, pa_source *dest) { static bool source_output_may_move_to_cb(pa_source_output *o, pa_source *dest) {
struct userdata *u; struct userdata *u;
pa_source_output_assert_ref(o); pa_source_output_assert_ref(o);
pa_assert_ctl_context(); pa_assert_ctl_context();
pa_assert_se(u = o->userdata); pa_assert_se(u = o->userdata);
if (!u->sink_input || !u->sink_input->sink)
return true;
return dest != u->sink_input->sink->monitor_source; return dest != u->sink_input->sink->monitor_source;
} }
@ -667,15 +670,15 @@ static void sink_input_moving_cb(pa_sink_input *i, pa_sink *dest) {
} }
/* Called from main thread */ /* Called from main thread */
static pa_bool_t sink_input_may_move_to_cb(pa_sink_input *i, pa_sink *dest) { static bool sink_input_may_move_to_cb(pa_sink_input *i, pa_sink *dest) {
struct userdata *u; struct userdata *u;
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
pa_assert_ctl_context(); pa_assert_ctl_context();
pa_assert_se(u = i->userdata); pa_assert_se(u = i->userdata);
if (!u->source_output->source->monitor_of) if (!u->source_output || !u->source_output->source)
return TRUE; return true;
return dest != u->source_output->source->monitor_of; return dest != u->source_output->source->monitor_of;
} }