mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

context: don't leak ports

Browse source
This commit is contained in:
Wim Taymans 2020-09-15 15:45:04 +02:00
parent a599e91c68
commit 175cd43226
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -733,7 +733,9 @@ static void device_clear_ports(struct global *g)
pa_card_info *i = &g->card_info.info; pa_card_info *i = &g->card_info.info;
uint32_t n; uint32_t n;
for (n = 0; n < i->n_ports; i++) { pw_log_debug("device %d clear ports %d", g->id, i->n_ports);
for (n = 0; n < i->n_ports; n++) {
pa_card_port_info *pi = i->ports[n]; pa_card_port_info *pi = i->ports[n];
pa_proplist_free(pi->proplist); pa_proplist_free(pi->proplist);
free(pi->profiles2); free(pi->profiles2);
@ -763,7 +765,7 @@ static void device_sync_ports(struct global *g)
g->card_info.port_devices = calloc(n_ports, sizeof(struct port_device)); g->card_info.port_devices = calloc(n_ports, sizeof(struct port_device));
i->n_ports = 0; i->n_ports = 0;
pw_log_debug("context %p: info for %d", g->context, g->id); pw_log_debug("context %p: info for %d n_ports:%d", g->context, g->id, n_ports);
j = 0; j = 0;
@ -850,8 +852,9 @@ static void device_sync_ports(struct global *g)
} }
i->ports[j] = NULL; i->ports[j] = NULL;
i->n_ports = j; i->n_ports = j;
if (i->n_ports == 0) if (i->n_ports == 0) {
i->ports = NULL; device_clear_ports(g);
}
spa_list_for_each(p, &g->card_info.routes, link) { spa_list_for_each(p, &g->card_info.routes, link) {
struct global *ng; struct global *ng;
@ -914,6 +917,8 @@ static void device_destroy(void *data)
{ {
struct global *global = data; struct global *global = data;
pw_log_debug("device %d destroy", global->id);
if (global->card_info.info.proplist) if (global->card_info.info.proplist)
pa_proplist_free(global->card_info.info.proplist); pa_proplist_free(global->card_info.info.proplist);