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

pulse: fix leaks

Browse source
This commit is contained in:
Wim Taymans 2020-06-04 18:26:36 +02:00
parent ed31ca30cd
commit 549431e8f3
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pipewire-pulseaudio/src/context.c
View file

@ -47,8 +47,6 @@ static void global_free(pa_context *c, struct global *g)
if (g->destroy) if (g->destroy)
g->destroy(g); g->destroy(g);
if (g->proxy) { if (g->proxy) {
spa_hook_remove(&g->object_listener);
spa_hook_remove(&g->proxy_listener);
pw_proxy_destroy(g->proxy); pw_proxy_destroy(g->proxy);
} }
if (g->props) if (g->props)
@ -73,6 +71,10 @@ static void context_unlink(pa_context *c)
pa_stream_set_state(s, c->state == PA_CONTEXT_FAILED ? pa_stream_set_state(s, c->state == PA_CONTEXT_FAILED ?
PA_STREAM_FAILED : PA_STREAM_TERMINATED); PA_STREAM_FAILED : PA_STREAM_TERMINATED);
} }
if (c->registry) {
pw_proxy_destroy((struct pw_proxy*)c->registry);
c->registry = NULL;
}
if (c->core) { if (c->core) {
pw_core_disconnect(c->core); pw_core_disconnect(c->core);
c->core = NULL; c->core = NULL;
@ -545,10 +547,17 @@ static void client_destroy(void *data)
pw_client_info_free(global->info); pw_client_info_free(global->info);
} }
static void proxy_removed(void *data)
{
struct global *g = data;
pw_proxy_destroy(g->proxy);
}
static void proxy_destroy(void *data) static void proxy_destroy(void *data)
{ {
struct global *g = data; struct global *g = data;
spa_hook_remove(&g->proxy_listener); spa_hook_remove(&g->proxy_listener);
spa_hook_remove(&g->object_listener);
g->proxy = NULL; g->proxy = NULL;
} }
@ -571,6 +580,7 @@ static void proxy_done(void *data, int seq)
static const struct pw_proxy_events proxy_events = { static const struct pw_proxy_events proxy_events = {
PW_VERSION_PROXY_EVENTS, PW_VERSION_PROXY_EVENTS,
.removed = proxy_removed,
.destroy = proxy_destroy, .destroy = proxy_destroy,
.done = proxy_done, .done = proxy_done,
}; };
@ -1059,6 +1069,10 @@ void pa_context_disconnect(pa_context *c)
pa_assert(c->refcount >= 1); pa_assert(c->refcount >= 1);
c->disconnect = true; c->disconnect = true;
if (c->registry) {
pw_proxy_destroy((struct pw_proxy*)c->registry);
c->registry = NULL;
}
if (c->core) { if (c->core) {
pw_core_disconnect(c->core); pw_core_disconnect(c->core);
c->core = NULL; c->core = NULL;