From 3650346f7041505fd0a28d939d05ac01e26e9b0c Mon Sep 17 00:00:00 2001 From: Georg Chini Date: Wed, 29 Mar 2017 07:10:28 +0200 Subject: sink-input/source-output: Don't crash when cork() is called without valid sink or source If pa_sink_input_cork() or pa_source_output_cork() were called without a sink or source attached, the calls would crash pulseaudio. This patch fixes the problem, so that a source output or sink input can still be corked or uncorked while source or sink are invalid. This is needed to correct the corking logic in module-loopback. --- src/modules/echo-cancel/module-echo-cancel.c | 5 ++--- src/modules/module-equalizer-sink.c | 2 +- src/modules/module-ladspa-sink.c | 2 +- src/modules/module-loopback.c | 5 ++--- src/modules/module-remap-sink.c | 2 +- src/modules/module-remap-source.c | 3 +-- src/modules/module-sine.c | 2 +- src/modules/module-suspend-on-idle.c | 4 ++-- src/modules/module-virtual-sink.c | 2 +- src/modules/module-virtual-source.c | 5 ++--- src/modules/module-virtual-surround-sink.c | 2 +- 11 files changed, 15 insertions(+), 19 deletions(-) (limited to 'src/modules') diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c index 706b3022..14a148a3 100644 --- a/src/modules/echo-cancel/module-echo-cancel.c +++ b/src/modules/echo-cancel/module-echo-cancel.c @@ -1322,12 +1322,11 @@ static void sink_input_detach_cb(pa_sink_input *i) { } } -/* Called from source I/O thread context. */ +/* Called from source I/O thread context except when cork() is called without valid source. */ static void source_output_state_change_cb(pa_source_output *o, pa_source_output_state_t state) { struct userdata *u; pa_source_output_assert_ref(o); - pa_source_output_assert_io_context(o); pa_assert_se(u = o->userdata); pa_log_debug("Source output %d state %d", o->index, state); @@ -1345,7 +1344,7 @@ static void sink_input_state_change_cb(pa_sink_input *i, pa_sink_input_state_t s /* If we are added for the first time, ask for a rewinding so that * we are heard right-away. */ if (PA_SINK_INPUT_IS_LINKED(state) && - i->thread_info.state == PA_SINK_INPUT_INIT) { + i->thread_info.state == PA_SINK_INPUT_INIT && i->sink) { pa_log_debug("Requesting rewind due to state change."); pa_sink_input_request_rewind(i, 0, false, true, true); } diff --git a/src/modules/module-equalizer-sink.c b/src/modules/module-equalizer-sink.c index 9c25f3f5..eb461815 100644 --- a/src/modules/module-equalizer-sink.c +++ b/src/modules/module-equalizer-sink.c @@ -860,7 +860,7 @@ static void sink_input_state_change_cb(pa_sink_input *i, pa_sink_input_state_t s /* If we are added for the first time, ask for a rewinding so that * we are heard right-away. */ if (PA_SINK_INPUT_IS_LINKED(state) && - i->thread_info.state == PA_SINK_INPUT_INIT) { + i->thread_info.state == PA_SINK_INPUT_INIT && i->sink) { pa_log_debug("Requesting rewind due to state change."); pa_sink_input_request_rewind(i, 0, false, true, true); } diff --git a/src/modules/module-ladspa-sink.c b/src/modules/module-ladspa-sink.c index c11fa5e7..6dd29873 100644 --- a/src/modules/module-ladspa-sink.c +++ b/src/modules/module-ladspa-sink.c @@ -633,7 +633,7 @@ static void sink_input_state_change_cb(pa_sink_input *i, pa_sink_input_state_t s /* If we are added for the first time, ask for a rewinding so that * we are heard right-away. */ if (PA_SINK_INPUT_IS_LINKED(state) && - i->thread_info.state == PA_SINK_INPUT_INIT) { + i->thread_info.state == PA_SINK_INPUT_INIT && i->sink) { pa_log_debug("Requesting rewind due to state change."); pa_sink_input_request_rewind(i, 0, false, true, true); } diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c index 12ab1209..4456b559 100644 --- a/src/modules/module-loopback.c +++ b/src/modules/module-loopback.c @@ -496,15 +496,14 @@ static void source_output_detach_cb(pa_source_output *o) { } } -/* Called from input thread context */ +/* Called from input thread context except when cork() is called without valid source. */ static void source_output_state_change_cb(pa_source_output *o, pa_source_output_state_t state) { struct userdata *u; pa_source_output_assert_ref(o); - pa_source_output_assert_io_context(o); pa_assert_se(u = o->userdata); - if (PA_SOURCE_OUTPUT_IS_LINKED(state) && o->thread_info.state == PA_SOURCE_OUTPUT_INIT) { + if (PA_SOURCE_OUTPUT_IS_LINKED(state) && o->thread_info.state == PA_SOURCE_OUTPUT_INIT && o->source) { u->skip = pa_usec_to_bytes(PA_CLIP_SUB(pa_source_get_latency_within_thread(o->source), u->latency), diff --git a/src/modules/module-remap-sink.c b/src/modules/module-remap-sink.c index 8a21c3c1..1b1c5e15 100644 --- a/src/modules/module-remap-sink.c +++ b/src/modules/module-remap-sink.c @@ -283,7 +283,7 @@ static void sink_input_state_change_cb(pa_sink_input *i, pa_sink_input_state_t s /* If we are added for the first time, ask for a rewinding so that * we are heard right-away. */ if (PA_SINK_INPUT_IS_LINKED(state) && - i->thread_info.state == PA_SINK_INPUT_INIT) { + i->thread_info.state == PA_SINK_INPUT_INIT && i->sink) { pa_log_debug("Requesting rewind due to state change."); pa_sink_input_request_rewind(i, 0, false, true, true); } diff --git a/src/modules/module-remap-source.c b/src/modules/module-remap-source.c index 9b62c518..3aa8f115 100644 --- a/src/modules/module-remap-source.c +++ b/src/modules/module-remap-source.c @@ -222,12 +222,11 @@ static void source_output_kill_cb(pa_source_output *o) { pa_module_unload_request(u->module, true); } -/* Called from output thread context */ +/* Called from output thread context except when cork() is called without valid source. */ static void source_output_state_change_cb(pa_source_output *o, pa_source_output_state_t state) { struct userdata *u; pa_source_output_assert_ref(o); - pa_source_output_assert_io_context(o); pa_assert_se(u = o->userdata); pa_log_debug("Source output %d state %d.", o->index, state); diff --git a/src/modules/module-sine.c b/src/modules/module-sine.c index d56fae54..45920717 100644 --- a/src/modules/module-sine.c +++ b/src/modules/module-sine.c @@ -112,7 +112,7 @@ static void sink_input_state_change_cb(pa_sink_input *i, pa_sink_input_state_t s /* If we are added for the first time, ask for a rewinding so that * we are heard right-away. */ if (PA_SINK_INPUT_IS_LINKED(state) && - i->thread_info.state == PA_SINK_INPUT_INIT) + i->thread_info.state == PA_SINK_INPUT_INIT && i->sink) pa_sink_input_request_rewind(i, 0, false, true, true); } diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c index 268f0aec..90d356fe 100644 --- a/src/modules/module-suspend-on-idle.c +++ b/src/modules/module-suspend-on-idle.c @@ -284,7 +284,7 @@ static pa_hook_result_t sink_input_state_changed_hook_cb(pa_core *c, pa_sink_inp pa_assert(u); state = pa_sink_input_get_state(s); - if (state == PA_SINK_INPUT_RUNNING || state == PA_SINK_INPUT_DRAINED) + if ((state == PA_SINK_INPUT_RUNNING || state == PA_SINK_INPUT_DRAINED) && s->sink) if ((d = pa_hashmap_get(u->device_infos, s->sink))) resume(d); @@ -296,7 +296,7 @@ static pa_hook_result_t source_output_state_changed_hook_cb(pa_core *c, pa_sourc pa_source_output_assert_ref(s); pa_assert(u); - if (pa_source_output_get_state(s) == PA_SOURCE_OUTPUT_RUNNING) { + if (pa_source_output_get_state(s) == PA_SOURCE_OUTPUT_RUNNING && s->source) { struct device_info *d; if (s->source->monitor_of) diff --git a/src/modules/module-virtual-sink.c b/src/modules/module-virtual-sink.c index 02cc1ac1..3316e930 100644 --- a/src/modules/module-virtual-sink.c +++ b/src/modules/module-virtual-sink.c @@ -409,7 +409,7 @@ static void sink_input_state_change_cb(pa_sink_input *i, pa_sink_input_state_t s /* If we are added for the first time, ask for a rewinding so that * we are heard right-away. */ if (PA_SINK_INPUT_IS_LINKED(state) && - i->thread_info.state == PA_SINK_INPUT_INIT) { + i->thread_info.state == PA_SINK_INPUT_INIT && i->sink) { pa_log_debug("Requesting rewind due to state change."); pa_sink_input_request_rewind(i, 0, false, true, true); } diff --git a/src/modules/module-virtual-source.c b/src/modules/module-virtual-source.c index 36edf785..0fab31e4 100644 --- a/src/modules/module-virtual-source.c +++ b/src/modules/module-virtual-source.c @@ -391,17 +391,16 @@ static void source_output_detach_cb(pa_source_output *o) { pa_source_set_rtpoll(u->source, NULL); } -/* Called from output thread context */ +/* Called from output thread context except when cork() is called without valid source.*/ static void source_output_state_change_cb(pa_source_output *o, pa_source_output_state_t state) { struct userdata *u; pa_source_output_assert_ref(o); - pa_source_output_assert_io_context(o); pa_assert_se(u = o->userdata); /* FIXME */ #if 0 - if (PA_SOURCE_OUTPUT_IS_LINKED(state) && o->thread_info.state == PA_SOURCE_OUTPUT_INIT) { + if (PA_SOURCE_OUTPUT_IS_LINKED(state) && o->thread_info.state == PA_SOURCE_OUTPUT_INIT && o->source) { u->skip = pa_usec_to_bytes(PA_CLIP_SUB(pa_source_get_latency_within_thread(o->source), u->latency), diff --git a/src/modules/module-virtual-surround-sink.c b/src/modules/module-virtual-surround-sink.c index 6c7120a0..4a53623c 100644 --- a/src/modules/module-virtual-surround-sink.c +++ b/src/modules/module-virtual-surround-sink.c @@ -421,7 +421,7 @@ static void sink_input_state_change_cb(pa_sink_input *i, pa_sink_input_state_t s /* If we are added for the first time, ask for a rewinding so that * we are heard right-away. */ if (PA_SINK_INPUT_IS_LINKED(state) && - i->thread_info.state == PA_SINK_INPUT_INIT) { + i->thread_info.state == PA_SINK_INPUT_INIT && i->sink) { pa_log_debug("Requesting rewind due to state change."); pa_sink_input_request_rewind(i, 0, false, true, true); } -- cgit v1.2.3