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

gvariant-serialiser: Convert endianness of offsets

Browse Source 
The array of offsets is little-endian, even on big-endian architectures
like s390x.

Fixes: ade71fb5 "gvariant: Don’t allow child elements to overlap with each other"
Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/2839
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-12-15 12:51:37 +00:00 committed by Philip Withnall
parent 8b80c451a5
commit ba2137b0d9
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glib/gvariant-serialiser.c
View File

@ -714,17 +714,19 @@ gvs_variable_sized_array_n_children (GVariantSerialised value)
/* Find the index of the first out-of-order element in @data, assuming that /* Find the index of the first out-of-order element in @data, assuming that
* @data is an array of elements of given @type, starting at index @start and * @data is an array of elements of given @type, starting at index @start and
* containing a further @len-@start elements. */ * containing a further @len-@start elements. */
#define DEFINE_FIND_UNORDERED(type) \ #define DEFINE_FIND_UNORDERED(type, le_to_native) \
static gsize \ static gsize \
find_unordered_##type (const guint8 *data, gsize start, gsize len) \ find_unordered_##type (const guint8 *data, gsize start, gsize len) \
{ \ { \
gsize off; \ gsize off; \
type current, previous; \ type current_le, previous_le, current, previous; \
\ \
memcpy (&previous, data + start * sizeof (current), sizeof (current)); \ memcpy (&previous_le, data + start * sizeof (current), sizeof (current)); \
previous = le_to_native (previous_le); \
for (off = (start + 1) * sizeof (current); off < len * sizeof (current); off += sizeof (current)) \ for (off = (start + 1) * sizeof (current); off < len * sizeof (current); off += sizeof (current)) \
{ \ { \
memcpy (&current, data + off, sizeof (current)); \ memcpy (&current_le, data + off, sizeof (current)); \
current = le_to_native (current_le); \
if (current < previous) \ if (current < previous) \
break; \ break; \
previous = current; \ previous = current; \
@ -732,10 +734,11 @@ gvs_variable_sized_array_n_children (GVariantSerialised value)
return off / sizeof (current) - 1; \ return off / sizeof (current) - 1; \
} }
DEFINE_FIND_UNORDERED (guint8); #define NO_CONVERSION(x) (x)
DEFINE_FIND_UNORDERED (guint16); DEFINE_FIND_UNORDERED (guint8, NO_CONVERSION);
DEFINE_FIND_UNORDERED (guint32); DEFINE_FIND_UNORDERED (guint16, GUINT16_FROM_LE);
DEFINE_FIND_UNORDERED (guint64); DEFINE_FIND_UNORDERED (guint32, GUINT32_FROM_LE);
DEFINE_FIND_UNORDERED (guint64, GUINT64_FROM_LE);
static GVariantSerialised static GVariantSerialised
gvs_variable_sized_array_get_child (GVariantSerialised value, gvs_variable_sized_array_get_child (GVariantSerialised value,