Bugfix, GVariant: missing padding for fixed-size tuples.submit/tizen_3.0_common/20161104.104000submit/tizen_3.0/20161028.092423submit/tizen_3.0/20161028.062323submit/tizen/20161017.013745accepted/tizen/wearable/20161017.075840accepted/tizen/tv/20161017.075825accepted/tizen/mobile/20161017.075813accepted/tizen/ivi/20161017.075855accepted/tizen/common/20161017.170121accepted/tizen/3.0/wearable/20161028.150918accepted/tizen/3.0/tv/20161028.143614accepted/tizen/3.0/mobile/20161028.143348accepted/tizen/3.0/ivi/20161028.151429accepted/tizen/3.0/common/20161114.110504

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

1 files changed, 15 insertions, 0 deletions

diff --git a/dbus/dbus-marshal-gvariant.c b/dbus/dbus-marshal-gvariant.c
index ebd07fea..1348965e 100644
--- 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);