diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-08 20:16:03 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-08 20:16:03 +0000 |
| commit | 6c241c1035a74f9ad4a526424a0be5c816bc61cb (patch) | |
| tree | 57c2d76171edf47427a2c3b3821de71aeff00845 /bus | |
| parent | c5020ac870c5990a36c3576453cc23431213e8bf (diff) | |
2003-04-08 Havoc Pennington <hp@redhat.com>
* 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
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/driver.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); |