GVariant: fix alignment of elements in array

This patch fixes two related bugs:
1. off-by-one in checking size and alignment of the next element
   in_dbus_reader_get_signature_fixed_size()
2. alignment requirements were not considered at all while iterating
   over array of variable size elements in array_reader_next().

Change-Id: Ibd9e1f3d11fbcd3ef0e6dbaa024e66b2568709d5

diff --git a/dbus/dbus-marshal-gvariant.c b/dbus/dbus-marshal-gvariant.c
index 3a862257393abe878333a5d2e2c7d880ecdf1e69..8fd7f22c109f80da82eaa5a5964624ee52f6ab84 100644 (file)
--- a/dbus/dbus-marshal-gvariant.c
+++ b/dbus/dbus-marshal-gvariant.c
@@ -960,7 +960,7 @@ _dbus_reader_get_signature_fixed_size (const DBusString *signature, int *pos, in
           res = update_size (res, res_recursive, &current_alignment, alignment_recursive);
 
           /* and update position */
-          *pos = recursive_pos - 1;
+          *pos = recursive_pos;
         }
         break;
          case DBUS_TYPE_INVALID:

diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c
index af027edc0c41d2d73e2227dd79afbfc9e9544017..4e89927429d3e2a08cc43db90107ed4c00d51a56 100644 (file)
--- a/dbus/dbus-marshal-recursive.c
+++ b/dbus/dbus-marshal-recursive.c
@@ -684,8 +684,10 @@ array_reader_next (DBusTypeReader *reader,
       int size = _dbus_reader_get_type_fixed_size (reader, &alignment);
       if (0 == size)
         {
-          /* variable size - use offsets*/
-          reader->value_pos = _dbus_reader_get_offset_of_end_of_variable (reader);
+          /* variable size - use offsets - BUT consider also alignment,
+             because elements in the array might have alignment requirements.
+           */
+          reader->value_pos = _DBUS_ALIGN_VALUE(_dbus_reader_get_offset_of_end_of_variable (reader), alignment);
           reader->variable_index++;
           reader->finished = (reader->variable_index >= reader->n_offsets);
         }