From 1f98ca9b57ecd36d032449972b7b9f006ad1e06f Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Mon, 10 Apr 2006 17:28:47 +0000 Subject: Fixed discoverable timeout and timeout list data memory leak --- hcid/dbus-adapter.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'hcid/dbus-adapter.c') diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c index 3de4b9b1..ecfe0198 100644 --- a/hcid/dbus-adapter.c +++ b/hcid/dbus-adapter.c @@ -386,6 +386,14 @@ static DBusHandlerResult handle_dev_set_discoverable_to_req(DBusConnection *conn return error_invalid_arguments(conn, msg); } + if (dbus_data->timeout_id) { + g_timeout_remove(dbus_data->timeout_id); + dbus_data->timeout_id = 0; + } + + if ((timeout != 0) && (dbus_data->mode & SCAN_INQUIRY)) + dbus_data->timeout_id = g_timeout_add(timeout, discoverable_timeout_handler, dbus_data); + dbus_data->discoverable_timeout = timeout; reply = dbus_message_new_method_return(msg); -- cgit