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

dbus: handle errors better

Browse source 
Make sure we don't crash when running out of fds and the loop functions
start to return NULL sources.
This commit is contained in:
Wim Taymans 2026-01-03 11:24:08 +01:00
parent 1f2a5d99b1
commit 4a2710c779
1 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
spa/plugins/support/dbus.c
View file

@ -141,20 +141,34 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *userdata)
struct connection *conn = userdata; struct connection *conn = userdata;
struct impl *impl = conn->impl; struct impl *impl = conn->impl;
struct source_data *data; struct source_data *data;
int dupfd;
spa_log_debug(impl->log, "add watch %p %d", watch, dbus_watch_get_unix_fd(watch)); spa_log_debug(impl->log, "add watch %p %d", watch, dbus_watch_get_unix_fd(watch));
data = calloc(1, sizeof(struct source_data)); data = calloc(1, sizeof(struct source_data));
if (data == NULL)
goto error;
data->conn = conn; data->conn = conn;
dupfd = dup(dbus_watch_get_unix_fd(watch));
if (dupfd == -1)
goto error_free;
/* we dup because dbus tends to add the same fd multiple times and our epoll /* we dup because dbus tends to add the same fd multiple times and our epoll
* implementation does not like that */ * implementation does not like that */
data->source = spa_loop_utils_add_io(impl->utils, data->source = spa_loop_utils_add_io(impl->utils,
dup(dbus_watch_get_unix_fd(watch)), dupfd, dbus_to_io(watch), true, handle_io_event, watch);
dbus_to_io(watch), true, handle_io_event, watch); if (data->source == NULL)
goto error_free;
spa_list_append(&conn->source_list, &data->link); spa_list_append(&conn->source_list, &data->link);
dbus_watch_set_data(watch, data, source_data_free); dbus_watch_set_data(watch, data, source_data_free);
return TRUE; return TRUE;
error_free:
free(data);
error:
spa_log_error(impl->log, "Failed to add watch: %m");
return FALSE;
} }
static void remove_watch(DBusWatch *watch, void *userdata) static void remove_watch(DBusWatch *watch, void *userdata)
@ -221,8 +235,12 @@ static dbus_bool_t add_timeout(DBusTimeout *timeout, void *userdata)
spa_log_debug(impl->log, "add timeout %p conn:%p impl:%p", timeout, conn, impl); spa_log_debug(impl->log, "add timeout %p conn:%p impl:%p", timeout, conn, impl);
data = calloc(1, sizeof(struct source_data)); data = calloc(1, sizeof(struct source_data));
if (data == NULL)
goto error;
data->conn = conn; data->conn = conn;
data->source = spa_loop_utils_add_timer(impl->utils, handle_timer_event, timeout); data->source = spa_loop_utils_add_timer(impl->utils, handle_timer_event, timeout);
if (data->source == NULL)
goto error_free;
spa_list_append(&conn->source_list, &data->link); spa_list_append(&conn->source_list, &data->link);
dbus_timeout_set_data(timeout, data, source_data_free); dbus_timeout_set_data(timeout, data, source_data_free);
@ -233,6 +251,12 @@ static dbus_bool_t add_timeout(DBusTimeout *timeout, void *userdata)
spa_loop_utils_update_timer(impl->utils, data->source, &ts, NULL, false); spa_loop_utils_update_timer(impl->utils, data->source, &ts, NULL, false);
return TRUE; return TRUE;
error_free:
free(data);
error:
spa_log_error(impl->log, "Failed to add timeout: %m");
return FALSE;
} }
static void remove_timeout(DBusTimeout *timeout, void *userdata) static void remove_timeout(DBusTimeout *timeout, void *userdata)
@ -420,6 +444,8 @@ impl_get_connection(void *object,
int res; int res;
conn = calloc(1, sizeof(struct connection)); conn = calloc(1, sizeof(struct connection));
if (conn == NULL)
return FALSE;
conn->this = impl_connection; conn->this = impl_connection;
conn->impl = impl; conn->impl = impl;
conn->type = type; conn->type = type;