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

pipewire: module-adapter: remove resource listener

Browse source 
Unregister the resource listener when the node is going
away to avoid use-after-free issues.

Fixes #1276
This commit is contained in:
Barnabás Pőcze 2021-06-07 01:43:19 +02:00 • committed by Wim Taymans
parent bec615971c
commit b6c6a21747
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/module-adapter.c
View file

@ -67,6 +67,7 @@ struct node_data {
struct pw_impl_node *follower; struct pw_impl_node *follower;
struct spa_hook adapter_listener; struct spa_hook adapter_listener;
struct pw_resource *resource; struct pw_resource *resource;
struct pw_resource *bound_resource;
struct spa_hook resource_listener; struct spa_hook resource_listener;
uint32_t new_id; uint32_t new_id;
unsigned int linger; unsigned int linger;
@ -98,8 +99,14 @@ static void node_destroy(void *data)
static void node_free(void *data) static void node_free(void *data)
{ {
struct node_data *nd = data; struct node_data *nd = data;
pw_log_debug(NAME" %p: free %p", nd, nd->follower); pw_log_debug(NAME" %p: free %p", nd, nd->follower);
if (nd->bound_resource != NULL)
spa_hook_remove(&nd->resource_listener);
spa_hook_remove(&nd->adapter_listener); spa_hook_remove(&nd->adapter_listener);
pw_impl_node_destroy(nd->follower); pw_impl_node_destroy(nd->follower);
} }
@ -127,6 +134,7 @@ static void node_initialized(void *data)
goto error_bind; goto error_bind;
} }
nd->bound_resource = bound_resource;
pw_resource_add_listener(bound_resource, &nd->resource_listener, &resource_events, nd); pw_resource_add_listener(bound_resource, &nd->resource_listener, &resource_events, nd);
return; return;