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. --- dbus/dbus-sysdeps.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'dbus/dbus-sysdeps.c') diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index 629adb6b..2b3ec51c 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -3359,26 +3359,29 @@ _dbus_user_at_console (const char *username, DBusString f; dbus_bool_t result; + result = FALSE; if (!_dbus_string_init (&f)) { - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); + _DBUS_SET_OOM (error); return FALSE; } if (!_dbus_string_append (&f, DBUS_CONSOLE_DIR)) { - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); - return FALSE; + _DBUS_SET_OOM (error); + goto out; } if (!_dbus_string_append (&f, username)) { - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); - return FALSE; + _DBUS_SET_OOM (error); + goto out; } result = _dbus_file_exists (_dbus_string_get_const_data (&f)); + + out: _dbus_string_free (&f); return result; -- cgit