Merge branch 'gvariant-test-align-more' into 'glib-2-58'

gvariant test: Also force alignment for tuple test data

See merge request GNOME/glib!569
This commit is contained in:
Philip Withnall
2019-01-04 11:24:58 +00:00

View File

@@ -4926,6 +4926,7 @@ test_normal_checking_array_offsets (void)
static void
test_normal_checking_tuple_offsets (void)
{
gpointer aligned_data;
const guint8 data[] = {
0x07, 0xe5, 0x00, 0x07, 0x00, 0x07,
'(', 'a', 's', 'a', 's', 'a', 's', 'a', 's', 'a', 's', 'a', 's', ')',
@@ -4934,13 +4935,15 @@ test_normal_checking_tuple_offsets (void)
GVariant *variant = NULL;
GVariant *normal_variant = NULL;
variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size,
FALSE, NULL, NULL);
aligned_data = g_memdup (data, size); /* guarantee alignment */
variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data,
size, FALSE, NULL, NULL);
g_assert_nonnull (variant);
normal_variant = g_variant_get_normal_form (variant);
g_assert_nonnull (normal_variant);
g_free (aligned_data);
g_variant_unref (normal_variant);
g_variant_unref (variant);
}