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-profiler: handle global's destroy event

Browse source 
Handle if the global is destroyed (e.g. `pw-cli destroy X`) to
avoid a use-after-free in `pw_global_destroy()` when it is called
with a dangling pointer from `module_destroy()`.
This commit is contained in:
Barnabás Pőcze 2021-11-09 23:08:31 +01:00 • committed by Wim Taymans
parent 336e4d5f03
commit d4e4b5df98
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/modules/module-profiler.c
View file

@ -77,6 +77,7 @@ struct impl {
struct spa_hook module_listener; struct spa_hook module_listener;
struct pw_global *global; struct pw_global *global;
struct spa_hook global_listener;
int64_t count; int64_t count;
uint32_t busy; uint32_t busy;
@ -338,7 +339,8 @@ static void module_destroy(void *data)
{ {
struct impl *impl = data; struct impl *impl = data;
pw_global_destroy(impl->global); if (impl->global != NULL)
pw_global_destroy(impl->global);
spa_hook_remove(&impl->module_listener); spa_hook_remove(&impl->module_listener);
@ -352,6 +354,22 @@ static const struct pw_impl_module_events module_events = {
.destroy = module_destroy, .destroy = module_destroy,
}; };
static void global_destroy(void *data)
{
struct impl *impl = data;
stop_listener(impl);
stop_flush(impl);
spa_hook_remove(&impl->global_listener);
impl->global = NULL;
}
static const struct pw_global_events global_events = {
PW_VERSION_GLOBAL_EVENTS,
.destroy = global_destroy,
};
SPA_EXPORT SPA_EXPORT
int pipewire__module_init(struct pw_impl_module *module, const char *args) int pipewire__module_init(struct pw_impl_module *module, const char *args)
{ {
@ -398,5 +416,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
pw_global_register(impl->global); pw_global_register(impl->global);
pw_global_add_listener(impl->global, &impl->global_listener, &global_events, impl);
return 0; return 0;
} }