Bugfix, GVariant: missing padding for fixed-size tuples.

There is a requirement for fixed-size tuples:
size of such tuple must be a multiply of its required alignment.
That part was overlooked in the implementation.
This commit adds padding accounting for both reading and writing.

Change-Id: I0825be6436b93b836dc333f5a395fdf1021f2a06

diff --git a/dbus/dbus-marshal-gvariant.c b/dbus/dbus-marshal-gvariant.c
index ebd07fea6268661a142e1331dd02d82bdc454507..1348965e0b83d3f421ec8087c2636dd143745a06 100644 (file)
--- a/dbus/dbus-marshal-gvariant.c
+++ b/dbus/dbus-marshal-gvariant.c
@@ -904,6 +904,10 @@ _dbus_reader_get_signature_fixed_size (const DBusString *signature, int *pos, in
       case DBUS_STRUCT_END_CHAR:
       case DBUS_DICT_ENTRY_END_CHAR:
         depth--;
+               /* For fixed-size structs we need to account padding.
+                */
+               if (!variable)
+                       res = _DBUS_ALIGN_VALUE (res, current_alignment);
         break;
       case DBUS_STRUCT_BEGIN_CHAR:
       case DBUS_DICT_ENTRY_BEGIN_CHAR:
@@ -1366,6 +1370,17 @@ _dbus_writer_unrecurse_gvariant_write (DBusTypeWriter *writer,
                                                 writer->value_pos);
       writer->value_pos += sub_len;
 
+      /* Structs may have padding if they are fixed-size structs.
+       * This is because of requirement that struct size must be a multiply
+       * of required alignment.
+       */
+      if (sub->is_fixed)
+      {
+        diff = _DBUS_ALIGN_VALUE (sub_len, sub->alignment) - sub_len;
+        result = result && _dbus_string_insert_bytes (writer->value_str, writer->value_pos, diff, 0);
+        writer->value_pos += diff;
+      }
+
       _dbus_string_free (sub->value_str);
       dbus_free (sub->value_str);