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

media-session: handle port without node

Browse source 
Don't crash when the node proxy is destroyed before the port proxy.
This commit is contained in:
Wim Taymans 2018-10-11 15:56:49 +02:00
parent bfcaec75c7
commit b3189bb5e7
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/examples/media-session.c
View file

@ -397,10 +397,16 @@ static void node_proxy_destroy(void *data)
{ {
struct node *n = data; struct node *n = data;
struct impl *impl = n->obj.impl; struct impl *impl = n->obj.impl;
struct port *p, *t;
pw_log_debug(NAME " %p: proxy destroy node %d", impl, n->obj.id); pw_log_debug(NAME " %p: proxy destroy node %d", impl, n->obj.id);
spa_list_remove(&n->l); spa_list_remove(&n->l);
spa_list_for_each_safe(p, t, &n->port_list, l) {
spa_list_remove(&p->l);
p->node = NULL;
}
if (n->info) if (n->info)
pw_node_info_free(n->info); pw_node_info_free(n->info);
if (n->session) { if (n->session) {
@ -540,6 +546,9 @@ static void port_event_param(void *object,
pw_log_debug(NAME" %p: param for port %d", p->obj.impl, p->obj.id); pw_log_debug(NAME" %p: param for port %d", p->obj.impl, p->obj.id);
if (node == NULL)
return;
if (id != SPA_PARAM_EnumFormat) if (id != SPA_PARAM_EnumFormat)
return; return;
@ -571,7 +580,10 @@ static void port_proxy_destroy(void *data)
pw_log_debug(NAME " %p: proxy destroy port %d", p->obj.impl, p->obj.id); pw_log_debug(NAME " %p: proxy destroy port %d", p->obj.impl, p->obj.id);
if (p->node) {
spa_list_remove(&p->l); spa_list_remove(&p->l);
p->node = NULL;
}
if (p->info) if (p->info)
pw_port_info_free(p->info); pw_port_info_free(p->info);
} }