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

fix some segfaults

Browse source
This commit is contained in:
Wim Taymans 2020-01-16 16:47:01 +01:00
parent 6af00219e1
commit f792c3f536
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/examples/media-session/alsa-monitor.c
View file

@ -667,9 +667,10 @@ static void alsa_remove_device(struct impl *impl, struct device *device)
spa_hook_remove(&device->sync_listener); spa_hook_remove(&device->sync_listener);
if (device->reserve) if (device->reserve)
rd_device_destroy(device->reserve); rd_device_destroy(device->reserve);
if (device->sdevice) if (device->sdevice) {
spa_hook_remove(&device->listener);
sm_object_destroy(&device->sdevice->obj); sm_object_destroy(&device->sdevice->obj);
spa_hook_remove(&device->listener); }
pw_unload_spa_handle(device->handle); pw_unload_spa_handle(device->handle);
pw_properties_free(device->props); pw_properties_free(device->props);
free(device); free(device);

5
src/examples/media-session/policy-node.c
View file

@ -186,7 +186,6 @@ handle_node(struct impl *impl, struct sm_object *object)
node->impl = impl; node->impl = impl;
node->client_id = client_id; node->client_id = client_id;
node->type = NODE_TYPE_UNKNOWN; node->type = NODE_TYPE_UNKNOWN;
node->enabled = true;
spa_list_append(&impl->node_list, &node->link); spa_list_append(&impl->node_list, &node->link);
if (strstr(media_class, "Stream/") == media_class) { if (strstr(media_class, "Stream/") == media_class) {
@ -250,6 +249,7 @@ handle_node(struct impl *impl, struct sm_object *object)
object->id, node->media, node->priority); object->id, node->media, node->priority);
} }
node->enabled = true;
node->obj->obj.mask |= SM_NODE_CHANGE_MASK_PARAMS; node->obj->obj.mask |= SM_NODE_CHANGE_MASK_PARAMS;
sm_object_add_listener(&node->obj->obj, &node->listener, &object_events, node); sm_object_add_listener(&node->obj->obj, &node->listener, &object_events, node);
@ -259,7 +259,8 @@ handle_node(struct impl *impl, struct sm_object *object)
static void destroy_node(struct impl *impl, struct node *node) static void destroy_node(struct impl *impl, struct node *node)
{ {
spa_list_remove(&node->link); spa_list_remove(&node->link);
spa_hook_remove(&node->listener); if (node->enabled)
spa_hook_remove(&node->listener);
free(node->media); free(node->media);
if (node->peer) if (node->peer)
node->peer->peer = NULL; node->peer->peer = NULL;