On Mon, 2017-04-10 at 22:13 +0200, Georg Chini wrote:
> During a move sink_input->sink is not valid. This leads to a crash when
> sink_input_set_rate() is called from the moving() callback. This patch
> fixes the problem.
> ---
> src/pulsecore/sink-input.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
> index d6ef57d3..bcc783ae 100644
> --- a/src/pulsecore/sink-input.c
> +++ b/src/pulsecore/sink-input.c
> @@ -1580,7 +1580,12 @@ int pa_sink_input_set_rate(pa_sink_input *i, uint32_t rate) {
>
> i->sample_spec.rate = rate;
>
> - pa_asyncmsgq_post(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_RATE, PA_UINT_TO_PTR(rate), 0, NULL, NULL);
> + if (i->sink)
> + pa_asyncmsgq_post(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_RATE, PA_UINT_TO_PTR(rate), 0, NULL, NULL);
> + else {
> + i->thread_info.sample_spec.rate = rate;
> + pa_resampler_set_input_rate(i->thread_info.resampler, rate);
> + }
>
> pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
> return 0;
Looks good to me.
--
Tanu
https://www.patreon.com/tanuk
