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

pulse-server: handle NULL registry

Browse source
This commit is contained in:
Wim Taymans 2020-11-06 15:35:44 +01:00
parent 06bfbe55d3
commit 42319e32be
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/modules/module-protocol-pulse/manager.c
View file

@ -543,6 +543,13 @@ struct pw_manager *pw_manager_new(struct pw_core *core)
return NULL; return NULL;
m->this.core = core; m->this.core = core;
m->this.registry = pw_core_get_registry(m->this.core,
PW_VERSION_REGISTRY, 0);
if (m->this.registry == NULL) {
free(m);
return NULL;
}
spa_hook_list_init(&m->hooks); spa_hook_list_init(&m->hooks);
spa_list_init(&m->this.object_list); spa_list_init(&m->this.object_list);
@ -550,8 +557,6 @@ struct pw_manager *pw_manager_new(struct pw_core *core)
pw_core_add_listener(m->this.core, pw_core_add_listener(m->this.core,
&m->core_listener, &m->core_listener,
&core_events, m); &core_events, m);
m->this.registry = pw_core_get_registry(m->this.core,
PW_VERSION_REGISTRY, 0);
pw_registry_add_listener(m->this.registry, pw_registry_add_listener(m->this.registry,
&m->registry_listener, &m->registry_listener,
&registry_events, m); &registry_events, m);
@ -611,7 +616,7 @@ int pw_manager_for_each_object(struct pw_manager *manager,
return 0; return 0;
} }
void pw_manager_destroy(struct pw_manager *manager) void pw_manager_destroy(struct pw_manager *manager)
{ {
struct manager *m = SPA_CONTAINER_OF(manager, struct manager, this); struct manager *m = SPA_CONTAINER_OF(manager, struct manager, this);
struct object *o; struct object *o;
@ -621,11 +626,11 @@ void pw_manager_destroy(struct pw_manager *manager)
spa_list_consume(o, &m->this.object_list, this.link) spa_list_consume(o, &m->this.object_list, this.link)
object_destroy(o); object_destroy(o);
spa_hook_remove(&m->registry_listener);
pw_proxy_destroy((struct pw_proxy*)m->this.registry);
if (m->this.info) if (m->this.info)
pw_core_info_free(m->this.info); pw_core_info_free(m->this.info);
if (m->this.registry) {
spa_hook_remove(&m->registry_listener);
pw_proxy_destroy((struct pw_proxy*)m->this.registry);
}
free(m); free(m);
} }