From 1658c8afe59166c9aa77549a3ac6a2e389327638 Mon Sep 17 00:00:00 2001 From: Olivier Andrieu Date: Fri, 17 Sep 2004 09:14:49 +0000 Subject: * dbus/dbus-sysdeps.c (_dbus_user_at_console): fix memleak in OOM. * doc/busconfig.dtd: update the DTD for the at_console attribute. * bus/driver.c (bus_driver_handle_hello): correctly handle Hello messages after the first one (bug #1389). * bus/dispatch.c (check_double_hello_message): add a test case for the double hello message bug. (check_existent_service_activation): fix check of spawning error. --- bus/driver.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'bus/driver.c') diff --git a/bus/driver.c b/bus/driver.c index 90659cd2..39d8b126 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -278,6 +278,14 @@ bus_driver_handle_hello (DBusConnection *connection, _DBUS_ASSERT_ERROR_IS_CLEAR (error); + if (bus_connection_is_active (connection)) + { + /* We already handled an Hello message for this connection. */ + dbus_set_error (error, DBUS_ERROR_FAILED, + "Already handled an Hello message"); + return FALSE; + } + /* Note that when these limits are exceeded we don't disconnect the * connection; we just sort of leave it hanging there until it times * out or disconnects itself or is dropped due to the max number of -- cgit