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

gvariant-serialiser: Rework child size calculation

Browse Source 
This reduces a few duplicate calls to `g_variant_type_info_query()` and
explains why they’re needed.

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

Helps: #2121
This commit is contained in:
Philip Withnall 2022-01-07 16:37:29 +00:00
parent 345cae9c1a
commit 73d0aa81c2
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
glib/gvariant-serialiser.c
View File

@ -1009,14 +1009,18 @@ gvs_tuple_get_child (GVariantSerialised value,
child.depth = value.depth + 1; child.depth = value.depth + 1;
offset_size = gvs_get_offset_size (value.size); offset_size = gvs_get_offset_size (value.size);
/* Ensure the size is set for fixed-sized children, or
* g_variant_serialised_check() will fail, even if we return
* (child.data == NULL) to indicate an error. */
if (member_info->ending_type == G_VARIANT_MEMBER_ENDING_FIXED)
g_variant_type_info_query (child.type_info, NULL, &child.size);
/* tuples are the only (potentially) fixed-sized containers, so the /* tuples are the only (potentially) fixed-sized containers, so the
* only ones that have to deal with the possibility of having %NULL * only ones that have to deal with the possibility of having %NULL
* data with a non-zero %size if errors occurred elsewhere. * data with a non-zero %size if errors occurred elsewhere.
*/ */
if G_UNLIKELY (value.data == NULL && value.size != 0) if G_UNLIKELY (value.data == NULL && value.size != 0)
{ {
g_variant_type_info_query (child.type_info, NULL, &child.size);
/* this can only happen in fixed-sized tuples, /* this can only happen in fixed-sized tuples,
* so the child must also be fixed sized. * so the child must also be fixed sized.
*/ */
@ -1034,29 +1038,12 @@ gvs_tuple_get_child (GVariantSerialised value,
else else
{ {
if (offset_size * (member_info->i + 1) > value.size) if (offset_size * (member_info->i + 1) > value.size)
{ return child;
/* if the child is fixed size, return its size.
* if child is not fixed-sized, return size = 0.
*/
g_variant_type_info_query (child.type_info, NULL, &child.size);
return child;
}
} }
gvs_tuple_get_member_bounds (value, index_, offset_size, &start, &end);
/* The child should not extend into the offset table. */ /* The child should not extend into the offset table. */
if (index_ != g_variant_type_info_n_members (value.type_info) - 1) gvs_tuple_get_member_bounds (value, index_, offset_size, &start, &end);
{ gvs_tuple_get_member_bounds (value, g_variant_type_info_n_members (value.type_info) - 1, offset_size, NULL, &last_end);
GVariantSerialised last_child;
last_child = gvs_tuple_get_child (value,
g_variant_type_info_n_members (value.type_info) - 1);
last_end = last_child.data + last_child.size - value.data;
g_variant_type_info_unref (last_child.type_info);
}
else
last_end = end;
if (start < end && end <= value.size && end <= last_end) if (start < end && end <= value.size && end <= last_end)
{ {