fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-23 02:38:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus-marshal-validate: Add more comments indicating what is going on

Browse source 
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-09-12 13:17:55 +01:00
parent 606795f908
commit 1b9e005322
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dbus/dbus-marshal-validate.c
View file

@ -368,10 +368,12 @@ validate_body_helper (DBusTypeReader *reader,
switch (current_type)
{
/* Special case of fixed-length types: every byte is valid */
case DBUS_TYPE_BYTE:
++p;
break;
/* Multi-byte fixed-length types require padding to their alignment */
case DBUS_TYPE_BOOLEAN:
case DBUS_TYPE_INT16:
case DBUS_TYPE_UINT16:
@ -408,6 +410,7 @@ validate_body_helper (DBusTypeReader *reader,
p += alignment;
break;
/* Types that start with a 4-byte length */
case DBUS_TYPE_ARRAY:
case DBUS_TYPE_STRING:
case DBUS_TYPE_OBJECT_PATH:
@ -430,6 +433,10 @@ validate_body_helper (DBusTypeReader *reader,
/* p may now be == end */
_dbus_assert (p <= end);
/* Arrays have padding between the length and the first
* array item, if it's necessary for the array's element type.
* This padding is not counted as part of the length
* claimed_len. */
if (current_type == DBUS_TYPE_ARRAY)
{
int array_elem_type = _dbus_type_reader_get_element_type (reader);