105 lines
3.5 KiB
Diff
105 lines
3.5 KiB
Diff
From 66e7c10aa1ec3102c49186f83671a5f0461ffbc0 Mon Sep 17 00:00:00 2001
|
|||
From: Philip Withnall <pwithnall@endlessos.org>
|
|||
Date: Fri, 7 Jan 2022 15:03:52 +0000
|
|||
Subject: [PATCH 05/18] gvariant-serialiser: Factor out code to get bounds of a
|
|||
tuple member
|
|||
|
|||
This introduces no functional changes.
|
|||
|
|||
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
|
|||
|
|||
Helps: #2121
|
|||
---
|
|||
glib/gvariant-serialiser.c | 73 ++++++++++++++++++++++++--------------
|
|||
1 file changed, 46 insertions(+), 27 deletions(-)
|
|||
|
|||
--- a/glib/gvariant-serialiser.c
|
|||
+++ b/glib/gvariant-serialiser.c
|
|||
@@ -942,6 +942,51 @@ gvs_variable_sized_array_is_normal (GVar
|
|||
* 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)
|
|||
{
|
|||
@@ -997,33 +1042,7 @@ gvs_tuple_get_child (GVariantSerialised
|
|||
}
|
|||
}
|
|||
|
|||
- 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)
|
