gvariant marshal: nested struct offset size accounts for fixed members

Change-Id: Ib8c7876c9a0072bde28201cb754b26ed20bbf892

diff --git a/dbus/dbus-marshal-gvariant.c b/dbus/dbus-marshal-gvariant.c
index 58cf414..071598a 100644 (file)
--- a/dbus/dbus-marshal-gvariant.c
+++ b/dbus/dbus-marshal-gvariant.c
@@ -1190,10 +1190,10 @@ _dbus_writer_gvariant_add_offset_with_variability (DBusTypeWriter *writer,
   else if (DBUS_TYPE_STRUCT == writer->container_type ||
            DBUS_TYPE_DICT_ENTRY == writer->container_type)
   {
+    check_offsets_for_adding (writer);
+
     if (writer->u.struct_or_dict.last_offset != 0)
     {
-      check_offsets_for_adding (writer);
-
       prepend_offset (writer->offsets,
                       writer->u.struct_or_dict.last_offset,
                       writer->offsets_size);