luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gvariant-serialiser: Factor out code to get bounds of a tuple member

Browse Source 
This introduces no functional changes.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Helps: #2121
This commit is contained in:
Philip Withnall 2022-01-07 15:03:52 +00:00
parent ade71fb544
commit 345cae9c1a
1 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
glib/gvariant-serialiser.c
View File

@ -944,6 +944,51 @@ gvs_variable_sized_array_is_normal (GVariantSerialised value)
* for the tuple. See the notes in gvarianttypeinfo.h.
*/
static void
gvs_tuple_get_member_bounds (GVariantSerialised value,
gsize index_,
gsize offset_size,
gsize *out_member_start,
gsize *out_member_end)
{
const GVariantMemberInfo *member_info;
gsize member_start, member_end;
member_info = g_variant_type_info_member_info (value.type_info, index_);
if (member_info->i + 1)
member_start = gvs_read_unaligned_le (value.data + value.size -
offset_size * (member_info->i + 1),
offset_size);
else
member_start = 0;
member_start += member_info->a;
member_start &= member_info->b;
member_start |= member_info->c;
if (member_info->ending_type == G_VARIANT_MEMBER_ENDING_LAST)
member_end = value.size - offset_size * (member_info->i + 1);
else if (member_info->ending_type == G_VARIANT_MEMBER_ENDING_FIXED)
{
gsize fixed_size;
g_variant_type_info_query (member_info->type_info, NULL, &fixed_size);
member_end = member_start + fixed_size;
}
else /* G_VARIANT_MEMBER_ENDING_OFFSET */
member_end = gvs_read_unaligned_le (value.data + value.size -
offset_size * (member_info->i + 2),
offset_size);
if (out_member_start != NULL)
*out_member_start = member_start;
if (out_member_end != NULL)
*out_member_end = member_end;
}
static gsize
gvs_tuple_n_children (GVariantSerialised value)
{
@ -999,33 +1044,7 @@ gvs_tuple_get_child (GVariantSerialised value,
}
}
if (member_info->i + 1)
start = gvs_read_unaligned_le (value.data + value.size -
offset_size * (member_info->i + 1),
offset_size);
else
start = 0;
start += member_info->a;
start &= member_info->b;
start |= member_info->c;
if (member_info->ending_type == G_VARIANT_MEMBER_ENDING_LAST)
end = value.size - offset_size * (member_info->i + 1);
else if (member_info->ending_type == G_VARIANT_MEMBER_ENDING_FIXED)
{
gsize fixed_size;
g_variant_type_info_query (child.type_info, NULL, &fixed_size);
end = start + fixed_size;
child.size = fixed_size;
}
else /* G_VARIANT_MEMBER_ENDING_OFFSET */
end = gvs_read_unaligned_le (value.data + value.size -
offset_size * (member_info->i + 2),
offset_size);
gvs_tuple_get_member_bounds (value, index_, offset_size, &start, &end);
/* The child should not extend into the offset table. */
if (index_ != g_variant_type_info_n_members (value.type_info) - 1)