summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-message.c
diff options
context:
space:
mode:
authorOlivier Andrieu <oliv__a@users.sourceforge.net>2004-07-22 07:07:01 +0000
committerOlivier Andrieu <oliv__a@users.sourceforge.net>2004-07-22 07:07:01 +0000
commit7eb304c54ee8ea6dfa3775cf89d63c39295747a8 (patch)
tree386e2c88c832b386221f2f1cabdedb83c1ef7b49 /dbus/dbus-message.c
parentc9c0adce43caa00345ad2aeb55822eabde523c2c (diff)
2004-07-22 Olivier Andrieu <oliv__a@users.sourceforge.net>
* dbus/dbus-sysdeps.c (fill_user_info): fix inexistent label name, breaking build on Solaris, reported by Farhad Saberi on the ML. * dbus/dbus-message.c (dbus_message_append_args_valist): fix the va_arg invocation to account for integer promotion in the case of DBUS_TYPE_BYTE (unsigned char is promoted to int). (bug #901) * bus/services.c (bus_service_remove_owner): fix bug #902, use _dbus_list_get_first_link, not _dbus_list_get_first. * dbus/dbus-bus.c (dbus_bus_service_exists): plug a memory leak. * dbus/dbus-object-tree.c (free_subtree_recurse): always null handler functions so that the asserts in _dbus_object_subtree_unref do not fail. * dbus/dbus-transport-unix.c (do_reading): _dbus_transport_queue_messages return value is of type dbus_bool_t, not DBusDispatchStatus.
Diffstat (limited to 'dbus/dbus-message.c')
-rw-r--r--dbus/dbus-message.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 2e4c9b35..8887720a 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -3984,10 +3984,9 @@ dbus_message_append_args_valist (DBusMessage *message,
goto errorout;
break;
case DBUS_TYPE_BYTE:
- /* FIXME if you pass an unsigned char to varargs it gets promoted to int,
- * so probably we should read an int here.
- */
- if (!dbus_message_iter_append_byte (&iter, va_arg (var_args, unsigned char)))
+ /* Read an int from varargs, because the original unsigned
+ * char has been promoted to int. */
+ if (!dbus_message_iter_append_byte (&iter, va_arg (var_args, int)))
goto errorout;
break;
case DBUS_TYPE_BOOLEAN: