2003-01-26 Anders Carlsson <andersca@codefactory.se>

	* bus/driver.c: (bus_driver_handle_hello),
	(bus_driver_send_welcome_message):
	Plug leaks

diff --git a/ChangeLog b/ChangeLog
index a8ee2b8d191cc4a01140b12d24c5f5d51b06b68b..e82ae6f6ccfc6c6f8243f3a8a59e824a7657f9b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-26  Anders Carlsson  <andersca@codefactory.se>
+
+       * bus/driver.c: (bus_driver_handle_hello),
+       (bus_driver_send_welcome_message):
+       Plug leaks
+       
 2003-01-26  Anders Carlsson  <andersca@codefactory.se>
 
        * dbus/dbus-auth.c: (process_auth), (_dbus_auth_unref):

diff --git a/bus/driver.c b/bus/driver.c
index 6e13e486b07711695c5f23e106be82e3f4a5f370..1fd26a26bd6a15b29b30d4269cb528ea65034428 100644 (file)
--- 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