From 6c241c1035a74f9ad4a526424a0be5c816bc61cb Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 8 Apr 2003 20:16:03 +0000 Subject: 2003-04-08 Havoc Pennington * bus/driver.c (bus_driver_handle_acquire_service): init retval/reply before checking name * dbus/dbus-marshal.c (_dbus_marshal_validate_arg): add a recursion depth argument * dbus/dbus-message.h (struct DBusMessageIter): put some padding in the public struct for future extension * dbus/dbus-message-builder.c (_dbus_message_data_load): fix typo * dbus/dbus-marshal.c (_dbus_marshal_validate_arg): fix a verbose message * doc/dbus-specification.sgml: fix typo --- bus/driver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bus') diff --git a/bus/driver.c b/bus/driver.c index ba31f3e7..31b848e9 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -457,7 +457,10 @@ bus_driver_handle_acquire_service (DBusConnection *connection, return FALSE; _dbus_verbose ("Trying to own service %s with flags 0x%x\n", name, flags); - + + retval = FALSE; + reply = NULL; + if (*name == ':') { /* Not allowed; only base services can start with ':' */ @@ -467,9 +470,6 @@ bus_driver_handle_acquire_service (DBusConnection *connection, goto out; } - - retval = FALSE; - reply = NULL; _dbus_string_init_const (&service_name, name); -- cgit