From 482dab2076282ef1195564fa60dd25c1ffb77682 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 31 Jan 2003 03:49:42 +0000 Subject: 2003-01-31 Havoc Pennington * doc/dbus-specification.sgml: fully specify the header. Add flags and major protocol version, and change header/body len to unsigned. * dbus/dbus-message-builder.c (append_saved_length): append length as uint32 * dbus/dbus-message.c (dbus_message_create_header): change header length and body length to unsigned. Add the new fields from the spec (_dbus_message_loader_return_buffer): unsigned header/body len --- dbus/dbus-message-builder.c | 4 +- dbus/dbus-message.c | 92 ++++++++++++++++++++++++++++++++++++--------- dbus/dbus-protocol.h | 3 ++ 3 files changed, 79 insertions(+), 20 deletions(-) (limited to 'dbus') diff --git a/dbus/dbus-message-builder.c b/dbus/dbus-message-builder.c index 8d012294..47313337 100644 --- a/dbus/dbus-message-builder.c +++ b/dbus/dbus-message-builder.c @@ -312,8 +312,8 @@ append_saved_length (DBusString *dest, return FALSE; } - if (!_dbus_marshal_int32 (dest, endian, - -1)) + if (!_dbus_marshal_uint32 (dest, endian, + -1)) { _dbus_warn ("failed to append a length\n"); return FALSE; diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index b485f638..3d0de77f 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -421,6 +421,36 @@ set_int_field (DBusMessage *message, } } +static dbus_bool_t +set_uint_field (DBusMessage *message, + int field, + dbus_uint32_t value) +{ + int offset = message->header_fields[field].offset; + + _dbus_assert (!message->locked); + + if (offset < 0) + { + /* need to append the field */ + + switch (field) + { + default: + _dbus_assert_not_reached ("appending a uint field we don't support appending"); + return FALSE; + } + } + else + { + _dbus_marshal_set_uint32 (&message->header, + message->byte_order, + offset, value); + + return TRUE; + } +} + static dbus_bool_t set_string_field (DBusMessage *message, int field, @@ -581,19 +611,28 @@ static dbus_bool_t dbus_message_create_header (DBusMessage *message, const char *service, const char *name) -{ +{ + unsigned int flags; + if (!_dbus_string_append_byte (&message->header, message->byte_order)) return FALSE; - - if (!_dbus_string_append_len (&message->header, "\0\0\0", 3)) + + flags = 0; + if (!_dbus_string_append_byte (&message->header, flags)) + return FALSE; + + if (!_dbus_string_append_byte (&message->header, DBUS_MAJOR_PROTOCOL_VERSION)) + return FALSE; + + if (!_dbus_string_append_byte (&message->header, 0)) return FALSE; message->header_fields[FIELD_HEADER_LENGTH].offset = 4; - if (!_dbus_marshal_int32 (&message->header, message->byte_order, 0)) + if (!_dbus_marshal_uint32 (&message->header, message->byte_order, 0)) return FALSE; message->header_fields[FIELD_BODY_LENGTH].offset = 8; - if (!_dbus_marshal_int32 (&message->header, message->byte_order, 0)) + if (!_dbus_marshal_uint32 (&message->header, message->byte_order, 0)) return FALSE; message->header_fields[FIELD_CLIENT_SERIAL].offset = 12; @@ -635,13 +674,13 @@ _dbus_message_lock (DBusMessage *message) if (!message->locked) { /* Fill in our lengths */ - set_int_field (message, - FIELD_HEADER_LENGTH, - _dbus_string_get_length (&message->header)); + set_uint_field (message, + FIELD_HEADER_LENGTH, + _dbus_string_get_length (&message->header)); - set_int_field (message, - FIELD_BODY_LENGTH, - _dbus_string_get_length (&message->body)); + set_uint_field (message, + FIELD_BODY_LENGTH, + _dbus_string_get_length (&message->body)); message->locked = TRUE; } @@ -1955,6 +1994,7 @@ _dbus_message_loader_return_buffer (DBusMessageLoader *loader, DBusMessage *message; const char *header_data; int byte_order, header_len, body_len; + dbus_uint32_t header_len_unsigned, body_len_unsigned; _dbus_string_get_const_data_len (&loader->data, &header_data, 0, 16); @@ -1971,18 +2011,34 @@ _dbus_message_loader_return_buffer (DBusMessageLoader *loader, return; } - header_len = _dbus_unpack_int32 (byte_order, header_data + 4); - body_len = _dbus_unpack_int32 (byte_order, header_data + 8); + header_len_unsigned = _dbus_unpack_uint32 (byte_order, header_data + 4); + body_len_unsigned = _dbus_unpack_uint32 (byte_order, header_data + 8); - if (header_len < 16 || body_len < 0) + if (header_len_unsigned < 16) { - _dbus_verbose ("Message had broken too-small header or body len %d %d\n", - header_len, body_len); + _dbus_verbose ("Message had broken too-small header length %u\n", + header_len_unsigned); loader->corrupted = TRUE; return; } - if (_DBUS_ALIGN_VALUE (header_len, 8) != (unsigned int) header_len) + if (header_len_unsigned > (unsigned) MAX_SANE_MESSAGE_SIZE || + body_len_unsigned > (unsigned) MAX_SANE_MESSAGE_SIZE) + { + _dbus_verbose ("Header or body length too large (%u %u)\n", + header_len_unsigned, + body_len_unsigned); + loader->corrupted = TRUE; + return; + } + + /* Now that we know the values are in signed range, get + * rid of stupid unsigned, just causes bugs + */ + header_len = header_len_unsigned; + body_len = body_len_unsigned; + + if (_DBUS_ALIGN_VALUE (header_len, 8) != header_len_unsigned) { _dbus_verbose ("header length %d is not aligned to 8 bytes\n", header_len); @@ -1998,7 +2054,7 @@ _dbus_message_loader_return_buffer (DBusMessageLoader *loader, return; } - if (_dbus_string_get_length (&loader->data) >= header_len + body_len) + if (_dbus_string_get_length (&loader->data) >= (header_len + body_len)) { HeaderField fields[FIELD_LAST]; int i; diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h index 774ccf2c..0df6c2e9 100644 --- a/dbus/dbus-protocol.h +++ b/dbus/dbus-protocol.h @@ -36,6 +36,9 @@ extern "C" { #define DBUS_LITTLE_ENDIAN ('l') /* LSB first */ #define DBUS_BIG_ENDIAN ('B') /* MSB first */ +/* Protocol version */ +#define DBUS_MAJOR_PROTOCOL_VERSION 0 + /* Data types */ #define DBUS_TYPE_INVALID 0 #define DBUS_TYPE_NIL 1 -- cgit