mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

client-node: also unref the activation memblock

Browse source
This commit is contained in:
Wim Taymans 2020-07-10 16:11:16 +02:00
parent e58fcb95d0
commit 031a8ea799
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -147,7 +147,8 @@ struct impl {
struct pw_map io_map; struct pw_map io_map;
struct pw_memblock *io_areas; struct pw_memblock *io_areas;
struct pw_node_activation *activation;
struct pw_memblock *activation;
struct spa_hook node_listener; struct spa_hook node_listener;
struct spa_hook resource_listener; struct spa_hook resource_listener;
@ -1256,12 +1257,11 @@ void pw_impl_client_node_registered(struct pw_impl_client_node *this, struct pw_
struct pw_impl_node *node = this->node; struct pw_impl_node *node = this->node;
struct pw_impl_client *client = impl->node.client; struct pw_impl_client *client = impl->node.client;
uint32_t node_id = global->id; uint32_t node_id = global->id;
struct pw_memblock *m;
pw_log_debug(NAME " %p: %d", &impl->node, node_id); pw_log_debug(NAME " %p: %d", &impl->node, node_id);
m = pw_mempool_import_block(client->pool, node->activation); impl->activation = pw_mempool_import_block(client->pool, node->activation);
if (m == NULL) { if (impl->activation == NULL) {
pw_log_debug(NAME " %p: can't import block: %m", &impl->node); pw_log_debug(NAME " %p: can't import block: %m", &impl->node);
return; return;
} }
@ -1275,7 +1275,7 @@ void pw_impl_client_node_registered(struct pw_impl_client_node *this, struct pw_
pw_client_node_resource_transport(this->resource, pw_client_node_resource_transport(this->resource,
impl->other_fds[0], impl->other_fds[0],
impl->other_fds[1], impl->other_fds[1],
m->id, impl->activation->id,
0, 0,
sizeof(struct pw_node_activation)); sizeof(struct pw_node_activation));
@ -1342,6 +1342,8 @@ static void node_free(void *data)
if (this->resource) if (this->resource)
pw_resource_destroy(this->resource); pw_resource_destroy(this->resource);
if (impl->activation)
pw_memblock_unref(impl->activation);
if (impl->io_areas) if (impl->io_areas)
pw_memblock_unref(impl->io_areas); pw_memblock_unref(impl->io_areas);