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

bluez5: handle fd allocation errors

Browse source 
For the timers, only set the data after we allocated the fd because this
is checked to free the fd again later.
This commit is contained in:
Wim Taymans 2026-05-05 11:37:18 +02:00
parent 96594d6716
commit 06ba2f792d
3 changed files with 44 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
spa/plugins/bluez5/bluez5-dbus.c
View file

@ -2265,13 +2265,17 @@ static int device_start_timer(struct spa_bt_device *device)
{
struct spa_bt_monitor *monitor = device->monitor;
struct itimerspec ts;
int res;
spa_log_debug(monitor->log, "device %p: start timer", device);
if (device->timer.data == NULL) {
res = spa_system_timerfd_create(monitor->main_system,
CLOCK_MONOTONIC, SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
if (res < 0)
return res;
device->timer.fd = res;
device->timer.data = device;
device->timer.func = device_timer_event;
device->timer.fd = spa_system_timerfd_create(monitor->main_system,
CLOCK_MONOTONIC, SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
device->timer.mask = SPA_IO_IN;
device->timer.rmask = 0;
spa_loop_add_source(monitor->main_loop, &device->timer);
@ -3538,11 +3542,15 @@ static int start_timeout_timer(struct spa_bt_monitor *monitor,
time_t timeout_msec, void *data)
{
struct itimerspec ts;
int res;
if (timer->data == NULL) {
res = spa_system_timerfd_create(
monitor->main_system, CLOCK_MONOTONIC, SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
if (res < 0)
return res;
timer->fd = res;
timer->data = data;
timer->func = timer_event;
timer->fd = spa_system_timerfd_create(
monitor->main_system, CLOCK_MONOTONIC, SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
timer->mask = SPA_IO_IN;
timer->rmask = 0;
spa_loop_add_source(monitor->main_loop, timer);