2023-05-01 22:45:52

by Luiz Augusto von Dentz

[permalink] [raw]
Subject: [BlueZ PATCH v3 2/4] client/player: Fix crash when RegisterEndpoint fails

From: Luiz Augusto von Dentz <[email protected]>

If RegisterEndpoint fails when there are multiple adapters it would
attempt to free the same endpoint multiple times.
---
client/player.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/player.c b/client/player.c
index cc35721d85b7..7719076c8cfa 100644
--- a/client/player.c
+++ b/client/player.c
@@ -2028,9 +2028,11 @@ static void register_endpoint_reply(DBusMessage *message, void *user_data)
bt_shell_printf("Failed to register endpoint: %s\n",
error.name);
dbus_error_free(&error);
- local_endpoints = g_list_remove(local_endpoints, ep);
- g_dbus_unregister_interface(dbus_conn, ep->path,
+ if (g_list_find(local_endpoints, ep)) {
+ local_endpoints = g_list_remove(local_endpoints, ep);
+ g_dbus_unregister_interface(dbus_conn, ep->path,
BLUEZ_MEDIA_ENDPOINT_INTERFACE);
+ }
return bt_shell_noninteractive_quit(EXIT_FAILURE);
}

--
2.40.0