mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-01 22:58:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

protocol-native: Don't leak formats

Browse source 
This clarifies some ownership issues with the formats idxset on the
server side so we don't end up leaking formats on errors.
This commit is contained in:
Arun Raghavan 2011-06-02 19:35:09 +05:30
parent a13da4e93e
commit b161a7e073
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/pulsecore/protocol-native.c
View file

@ -1037,6 +1037,9 @@ static playback_stream* playback_stream_new(
pa_bool_t relative_volume, pa_bool_t relative_volume,
int *ret) { int *ret) {
/* Note: This function takes ownership of the 'formats' param, so we need
* to take extra care to not leak it */
playback_stream *s, *ssync; playback_stream *s, *ssync;
pa_sink_input *sink_input = NULL; pa_sink_input *sink_input = NULL;
pa_memchunk silence; pa_memchunk silence;
@ -1067,7 +1070,7 @@ static playback_stream* playback_stream_new(
sink = ssync->sink_input->sink; sink = ssync->sink_input->sink;
else if (sink != ssync->sink_input->sink) { else if (sink != ssync->sink_input->sink) {
*ret = PA_ERR_INVALID; *ret = PA_ERR_INVALID;
return NULL; goto out;
} }
} }
@ -1083,8 +1086,11 @@ static playback_stream* playback_stream_new(
pa_sink_input_new_data_set_sample_spec(&data, ss); pa_sink_input_new_data_set_sample_spec(&data, ss);
if (pa_channel_map_valid(map)) if (pa_channel_map_valid(map))
pa_sink_input_new_data_set_channel_map(&data, map); pa_sink_input_new_data_set_channel_map(&data, map);
if (formats) if (formats) {
pa_sink_input_new_data_set_formats(&data, formats); pa_sink_input_new_data_set_formats(&data, formats);
/* Ownership transferred to new_data, so we don't free it ourseleves */
formats = NULL;
}
if (volume) { if (volume) {
pa_sink_input_new_data_set_volume(&data, volume); pa_sink_input_new_data_set_volume(&data, volume);
data.volume_is_absolute = !relative_volume; data.volume_is_absolute = !relative_volume;
@ -1102,7 +1108,7 @@ static playback_stream* playback_stream_new(
pa_sink_input_new_data_done(&data); pa_sink_input_new_data_done(&data);
if (!sink_input) if (!sink_input)
return NULL; goto out;
s = pa_msgobject_new(playback_stream); s = pa_msgobject_new(playback_stream);
s->parent.parent.parent.free = playback_stream_free; s->parent.parent.parent.free = playback_stream_free;
@ -1164,6 +1170,11 @@ static playback_stream* playback_stream_new(
(double) s->configured_sink_latency / PA_USEC_PER_MSEC); (double) s->configured_sink_latency / PA_USEC_PER_MSEC);
pa_sink_input_put(s->sink_input); pa_sink_input_put(s->sink_input);
out:
if (formats)
pa_idxset_free(formats, (pa_free2_cb_t) pa_format_info_free2, NULL);
return s; return s;
} }
@ -2071,6 +2082,8 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u
muted_set = muted_set || muted; muted_set = muted_set || muted;
s = playback_stream_new(c, sink, &ss, &map, formats, &attr, volume_set ? &volume : NULL, muted, muted_set, syncid, &missing, flags, p, adjust_latency, early_requests, relative_volume, &ret); s = playback_stream_new(c, sink, &ss, &map, formats, &attr, volume_set ? &volume : NULL, muted, muted_set, syncid, &missing, flags, p, adjust_latency, early_requests, relative_volume, &ret);
/* We no longer own the formats idxset */
formats = NULL;
CHECK_VALIDITY_GOTO(c->pstream, s, tag, ret, finish); CHECK_VALIDITY_GOTO(c->pstream, s, tag, ret, finish);