mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-05-11 23:50:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: avoid double free of props

Browse source 
Use spa_steal_ptr to transfer props ownership when we can.

This fixes a problem in the upload stream where the props would be freed
twice when buffer allocation failed, once with properties_free and
then with stream_free.
This commit is contained in:
Wim Taymans 2026-05-07 10:30:35 +02:00
parent e975a44d05
commit aa36fd5a17
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -1836,8 +1836,7 @@ static int do_create_playback_stream(struct client *client, uint32_t command, ui
if (dont_inhibit_auto_suspend) if (dont_inhibit_auto_suspend)
pw_properties_set(props, PW_KEY_NODE_PASSIVE, "true"); pw_properties_set(props, PW_KEY_NODE_PASSIVE, "true");
stream->stream = pw_stream_new(client->core, name, props); stream->stream = pw_stream_new(client->core, name, spa_steal_ptr(props));
props = NULL;
if (stream->stream == NULL) if (stream->stream == NULL)
goto error_errno; goto error_errno;
@ -2136,8 +2135,7 @@ static int do_create_record_stream(struct client *client, uint32_t command, uint
if (dont_inhibit_auto_suspend) if (dont_inhibit_auto_suspend)
pw_properties_set(props, PW_KEY_NODE_PASSIVE, "true"); pw_properties_set(props, PW_KEY_NODE_PASSIVE, "true");
stream->stream = pw_stream_new(client->core, name, props); stream->stream = pw_stream_new(client->core, name, spa_steal_ptr(props));
props = NULL;
if (stream->stream == NULL) if (stream->stream == NULL)
goto error_errno; goto error_errno;
@ -2361,7 +2359,7 @@ static int do_create_upload_stream(struct client *client, uint32_t command, uint
if (stream == NULL) if (stream == NULL)
goto error_errno; goto error_errno;
stream->props = props; stream->props = spa_steal_ptr(props);
stream->bufsize = stream->attr.maxlength; stream->bufsize = stream->attr.maxlength;
stream->buffer = calloc(1, stream->bufsize); stream->buffer = calloc(1, stream->bufsize);
@ -2461,16 +2459,14 @@ static int do_finish_upload_stream(struct client *client, uint32_t command, uint
sample->ref = 1; sample->ref = 1;
sample->impl = impl; sample->impl = impl;
sample->name = name; sample->name = name;
sample->props = stream->props; sample->props = spa_steal_ptr(stream->props);
sample->ss = stream->ss; sample->ss = stream->ss;
sample->map = stream->map; sample->map = stream->map;
sample->buffer = stream->buffer; sample->buffer = spa_steal_ptr(stream->buffer);
sample->length = stream->attr.maxlength; sample->length = stream->attr.maxlength;
impl->stat.sample_cache += sample->length; impl->stat.sample_cache += sample->length;
stream->props = NULL;
stream->buffer = NULL;
stream_free(stream); stream_free(stream);
broadcast_subscribe_event(impl, broadcast_subscribe_event(impl,