mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-05-07 12:06:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: fix cleanup

Browse source 
Clean up the transport listener and the codec_props on error.
Also clean up when the timerfd allocation fails.
This commit is contained in:
Wim Taymans 2026-05-06 14:03:18 +02:00
parent 7254b8288f
commit 3e53487c72
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spa/plugins/bluez5/media-source.c
View file

@ -2134,6 +2134,7 @@ impl_init(const struct spa_handle_factory *factory,
struct impl *this;
struct port *port;
const char *str;
int res;
spa_return_val_if_fail(factory != NULL, -EINVAL);
spa_return_val_if_fail(handle != NULL, -EINVAL);
@ -2268,10 +2269,10 @@ impl_init(const struct spa_handle_factory *factory,
spa_bt_transport_add_listener(this->transport,
&this->transport_listener, &transport_events, this);
this->timerfd = spa_system_timerfd_create(this->data_system,
CLOCK_MONOTONIC, SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
if (this->timerfd < 0)
return this->timerfd;
if ((res = spa_system_timerfd_create(this->data_system,
CLOCK_MONOTONIC, SPA_FD_CLOEXEC | SPA_FD_NONBLOCK)) < 0)
goto error_remove_listener;
this->timerfd = res;
this->node_latency = 512;
@ -2280,6 +2281,12 @@ impl_init(const struct spa_handle_factory *factory,
this->fd = -1;
return 0;
error_remove_listener:
spa_hook_remove(&this->transport_listener);
if (this->codec_props && this->codec->clear_props)
this->codec->clear_props(this->codec_props);
return res;
}
static const struct spa_interface_info impl_interfaces[] = {