diff options
| author | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2014-02-12 12:41:34 +0200 |
|---|---|---|
| committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2014-02-14 16:04:32 +0200 |
| commit | ee1a96499447d0bc3458ab5075d05dbefcee225c (patch) | |
| tree | 81996f05aff4d308eba662684d148ff92fcd1b87 /src/pulsecore/sink-input.c | |
| parent | a9dfc0731980503c9516b56d49b0ecf65e95b3dd (diff) | |
sink-input, source-output: Don't crash if format negotiation fails
A segfault was reported on this line:
pa_return_val_if_fail(PA_SINK_IS_LINKED(pa_sink_get_state(data->sink)), -PA_ERR_BADSTATE);
After expanding the pa_sink_get_state() macro, the line looks like
this:
pa_return_val_if_fail(PA_SINK_IS_LINKED(data->sink->state), -PA_ERR_BADSTATE);
So data->sink was apparently NULL. That could happen if we try to fall
back to the default sink, but format negotiation fails.
This bug was introduced in commit
71816ecb7f81fe7a124cefa2258cfa64046908a1.
BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=74646
Diffstat (limited to 'src/pulsecore/sink-input.c')
| -rw-r--r-- | src/pulsecore/sink-input.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index 97a55a6f3..9ae95e2ec 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -334,13 +334,6 @@ int pa_sink_input_new( pa_sink_input_new_data_set_sink(data, sink, false); } - pa_return_val_if_fail(PA_SINK_IS_LINKED(pa_sink_get_state(data->sink)), -PA_ERR_BADSTATE); - pa_return_val_if_fail(!data->sync_base || (data->sync_base->sink == data->sink - && pa_sink_input_get_state(data->sync_base) == PA_SINK_INPUT_CORKED), - -PA_ERR_INVALID); - - /* Routing's done, we have a sink. Now let's fix the format. */ - /* If something didn't pick a format for us, pick the top-most format since * we assume this is sorted in priority order */ if (!data->format && data->nego_formats && !pa_idxset_isempty(data->nego_formats)) @@ -359,6 +352,13 @@ int pa_sink_input_new( return -PA_ERR_NOTSUPPORTED; } + pa_return_val_if_fail(PA_SINK_IS_LINKED(pa_sink_get_state(data->sink)), -PA_ERR_BADSTATE); + pa_return_val_if_fail(!data->sync_base || (data->sync_base->sink == data->sink + && pa_sink_input_get_state(data->sync_base) == PA_SINK_INPUT_CORKED), + -PA_ERR_INVALID); + + /* Routing is done. We have a sink and a format. */ + if (data->volume_is_set && pa_format_info_is_pcm(data->format)) { /* If volume is set, we need to save the original data->channel_map, * so that we can remap the volume from the original channel map to the |