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-input, source-output: add a couple of assertions

Browse source 
Coverity complained about data->sink being possibly NULL when it's
dereferenced later. It was difficult for me to figure out whether that
was a false positive or not. Hopefully the comments make it a bit
easier to reason about the code in the future.

CID: 1323591
This commit is contained in:
Tanu Kaskinen 2017-10-29 21:15:48 +02:00
parent 459cea16ee
commit 917730a555
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/pulsecore/sink-input.c
View file

@ -338,6 +338,11 @@ int pa_sink_input_new(
data->format = pa_format_info_copy(pa_idxset_first(data->nego_formats, NULL)); data->format = pa_format_info_copy(pa_idxset_first(data->nego_formats, NULL));
if (PA_LIKELY(data->format)) { if (PA_LIKELY(data->format)) {
/* We know that data->sink is set, because data->format has been set.
* data->format is set after a successful format negotiation, and that
* can't happen before data->sink has been set. */
pa_assert(data->sink);
pa_log_debug("Negotiated format: %s", pa_format_info_snprint(fmt, sizeof(fmt), data->format)); pa_log_debug("Negotiated format: %s", pa_format_info_snprint(fmt, sizeof(fmt), data->format));
} else { } else {
pa_format_info *format; pa_format_info *format;

5
src/pulsecore/source-output.c
View file

@ -280,6 +280,11 @@ int pa_source_output_new(
data->format = pa_format_info_copy(pa_idxset_first(data->nego_formats, NULL)); data->format = pa_format_info_copy(pa_idxset_first(data->nego_formats, NULL));
if (PA_LIKELY(data->format)) { if (PA_LIKELY(data->format)) {
/* We know that data->source is set, because data->format has been set.
* data->format is set after a successful format negotiation, and that
* can't happen before data->source has been set. */
pa_assert(data->source);
pa_log_debug("Negotiated format: %s", pa_format_info_snprint(fmt, sizeof(fmt), data->format)); pa_log_debug("Negotiated format: %s", pa_format_info_snprint(fmt, sizeof(fmt), data->format));
} else { } else {
pa_format_info *format; pa_format_info *format;