mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-17 08:56:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

client-node: close fds in port_buffers() error case

Browse source 
When port_buffers are configured on a destroyed or invalid port, close
the fds or else we leak them.
This commit is contained in:
Wim Taymans 2023-11-17 15:22:56 +01:00
parent 7db1e7f643
commit 44bfeaac6e
1 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/modules/module-client-node/client-node.c
View file

@ -255,19 +255,21 @@ static void clear_data(struct impl *impl, struct spa_data *d)
} }
} }
static void clear_buffer(struct impl *impl, struct spa_buffer *b)
{
uint32_t i;
for (i = 0; i < b->n_datas; i++)
clear_data(impl, &b->datas[i]);
}
static int clear_buffers(struct impl *impl, struct mix *mix) static int clear_buffers(struct impl *impl, struct mix *mix)
{ {
uint32_t i, j; uint32_t i;
for (i = 0; i < mix->n_buffers; i++) { for (i = 0; i < mix->n_buffers; i++) {
struct buffer *b = &mix->buffers[i]; struct buffer *b = &mix->buffers[i];
spa_log_debug(impl->log, "%p: clear buffer %d", impl, i); spa_log_debug(impl->log, "%p: clear buffer %d", impl, i);
clear_buffer(impl, &b->buffer);
for (j = 0; j < b->buffer.n_datas; j++) {
struct spa_data *d = &b->datas[j];
clear_data(impl, d);
}
pw_memblock_unref(b->mem); pw_memblock_unref(b->mem);
} }
mix->n_buffers = 0; mix->n_buffers = 0;
@ -1018,10 +1020,10 @@ static int client_node_port_buffers(void *data,
mix_id = SPA_ID_INVALID; mix_id = SPA_ID_INVALID;
if ((mix = find_mix(p, mix_id)) == NULL || !mix->valid) if ((mix = find_mix(p, mix_id)) == NULL || !mix->valid)
return -EINVAL; goto invalid;
if (mix->n_buffers != n_buffers) if (mix->n_buffers != n_buffers)
return -EINVAL; goto invalid;
for (i = 0; i < n_buffers; i++) { for (i = 0; i < n_buffers; i++) {
struct spa_buffer *oldbuf, *newbuf; struct spa_buffer *oldbuf, *newbuf;
@ -1033,7 +1035,7 @@ static int client_node_port_buffers(void *data,
spa_log_debug(impl->log, "buffer %d n_datas:%d", i, newbuf->n_datas); spa_log_debug(impl->log, "buffer %d n_datas:%d", i, newbuf->n_datas);
if (oldbuf->n_datas != newbuf->n_datas) if (oldbuf->n_datas != newbuf->n_datas)
return -EINVAL; goto invalid;
for (j = 0; j < b->buffer.n_datas; j++) { for (j = 0; j < b->buffer.n_datas; j++) {
struct spa_chunk *oldchunk = oldbuf->datas[j].chunk; struct spa_chunk *oldchunk = oldbuf->datas[j].chunk;
@ -1054,6 +1056,10 @@ static int client_node_port_buffers(void *data,
mix->n_buffers = n_buffers; mix->n_buffers = n_buffers;
return 0; return 0;
invalid:
for (i = 0; i < n_buffers; i++)
clear_buffer(impl, buffers[i]);
return -EINVAL;
} }
static const struct pw_client_node_methods client_node_methods = { static const struct pw_client_node_methods client_node_methods = {