mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: clean up everything when the context is destroyed

Browse source 
Clean everything up when the context is destroyed to avoid
problems stemming from the destruction order of objects
in the context.

Furthermore, free messages after all clients have been freed
because `client_free()` may very well call `message_free()`
which would lead to memory leaks if `impl->free_messages` were
processed first.
This commit is contained in:
Barnabás Pőcze 2022-01-30 18:45:36 +01:00 • committed by Wim Taymans
parent 1bf00720e3
commit a79bb60754
1 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5081,44 +5081,52 @@ static int impl_free_module(void *item, void *data)
return 0;
}
static void impl_free(struct impl *impl)
static void impl_clear(struct impl *impl)
{
struct message *msg;
struct server *s;
struct client *c;
struct message *msg;
#if HAVE_DBUS
if (impl->dbus_name)
dbus_release_name(impl->dbus_name);
#endif
spa_list_consume(s, &impl->servers, link)
server_free(s);
spa_list_consume(c, &impl->cleanup_clients, link)
client_free(c);
spa_list_consume(msg, &impl->free_messages, link)
message_free(impl, msg, true, true);
if (impl->context != NULL)
spa_hook_remove(&impl->context_listener);
spa_list_consume(c, &impl->cleanup_clients, link)
client_free(c);
spa_list_consume(s, &impl->servers, link)
server_free(s);
pw_map_for_each(&impl->samples, impl_free_sample, impl);
pw_map_clear(&impl->samples);
pw_map_for_each(&impl->modules, impl_free_module, impl);
pw_map_clear(&impl->modules);
#if HAVE_DBUS
if (impl->dbus_name) {
dbus_release_name(impl->dbus_name);
impl->dbus_name = NULL;
}
#endif
if (impl->context) {
spa_hook_remove(&impl->context_listener);
impl->context = NULL;
}
pw_properties_free(impl->props);
impl->props = NULL;
}
static void impl_free(struct impl *impl)
{
impl_clear(impl);
free(impl);
}
static void context_destroy(void *data)
{
struct impl *impl = data;
struct server *s;
spa_list_consume(s, &impl->servers, link)
server_free(s);
spa_hook_remove(&impl->context_listener);
impl->context = NULL;
impl_clear(data);
}
static const struct pw_context_events context_events = {