core: Fix not replying to DisconnectProfile
Luiz Augusto von Dentz
maintainerPATCH 1/2 core: Fix not replying to DisconnectProfile
From: Luiz Augusto von Dentz <[email protected]>
btd_service_disconnect may cause a service to disconnect before returning which cause dev->disconnect to be set after device_profile_disconnected.
--- src/device.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
src/device.c +6 -3
@@ -1434,11 +1434,14 @@ static DBusMessage *disconnect_profile(DBusConnection *conn, DBusMessage *msg,if (!service)return btd_error_invalid_args (msg); + dev->disconnect =dbus_message_ref (msg); + err =btd_service_disconnect (service); -if (err ==0 ) { - dev->disconnect =dbus_message_ref (msg); +if (err ==0 )return NULL ; - } + +dbus_message_unref (dev->disconnect); + dev->disconnect =NULL ;if (err == -ENOTSUP )return btd_error_not_supported (msg);
Signature · 1 line
1.8.3.1
Luiz Augusto von Dentz
maintainerPATCH 2/2 core: Fix leaking disconnect message
From: Luiz Augusto von Dentz <[email protected]>
If a disconnect message is pending return an error since currently the code cannot process it in parallel.
--- src/device.c | 3 +++ 1 file changed, 3 insertions(+)
src/device.c +3 -0
@@ -1434,6 +1434,9 @@ static DBusMessage *disconnect_profile(DBusConnection *conn, DBusMessage *msg,if (!service)return btd_error_invalid_args (msg); +if (dev->disconnect) +return btd_error_in_progress (msg); + dev->disconnect =dbus_message_ref (msg); err =btd_service_disconnect (service);
Signature · 1 line
1.8.3.1
Hi Luiz,
Quoted 5 lines · Luiz Augusto von Dentz
btd_service_disconnectmay cause a service to disconnect before returning which causedev->disconnectto be set afterdevice_profile_disconnected.--- src/device.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
Both patches have been applied. Thanks.
Johan