From d5ad082fecbbd803fd89b3574ac137b3fa964bc7 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Sun, 26 Jan 2003 01:34:22 +0000 Subject: 2003-01-26 Anders Carlsson * bus/driver.c: (bus_driver_handle_hello), (bus_driver_send_welcome_message): Plug leaks --- ChangeLog | 6 ++++++ bus/driver.c | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8ee2b8d..e82ae6f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-01-26 Anders Carlsson + + * bus/driver.c: (bus_driver_handle_hello), + (bus_driver_send_welcome_message): + Plug leaks + 2003-01-26 Anders Carlsson * dbus/dbus-auth.c: (process_auth), (_dbus_auth_unref): diff --git a/bus/driver.c b/bus/driver.c index 6e13e486..1fd26a26 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -144,12 +144,17 @@ bus_driver_handle_hello (DBusConnection *connection, 0)) != DBUS_RESULT_NO_MEMORY); if (result != DBUS_RESULT_SUCCESS) - dbus_connection_disconnect (connection); - + { + dbus_free (name); + dbus_connection_disconnect (connection); + } + _DBUS_HANDLE_OOM (_dbus_string_init (&unique_name, _DBUS_INT_MAX)); _DBUS_HANDLE_OOM (create_unique_client_name (name, &unique_name)); + dbus_free (name); + /* Create the service */ _DBUS_HANDLE_OOM (service = bus_service_lookup (&unique_name, TRUE)); @@ -188,6 +193,8 @@ bus_driver_send_welcome_message (DBusConnection *connection, NULL)); _DBUS_HANDLE_OOM (dbus_connection_send_message (connection, welcome, NULL, NULL)); + + dbus_message_unref (welcome); } static void -- cgit