luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-10 04:45:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '417-variant-ay-glib-2-58' into 'glib-2-58'

Browse Source 
Fix ^*ay handling in g_variant_iter_loop() (backport to glib-2-58)

See merge request GNOME/glib!437
This commit is contained in:
Emmanuele Bassi 2018-11-23 16:39:20 +00:00
commit a7a0decdb6
2 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glib/gvariant.c
View File

@ -4662,7 +4662,15 @@ g_variant_valist_free_nnp (const gchar *str,
break;
case '^':
if (str[2] != '&') /* '^as', '^ao' */
if (g_str_has_suffix (str, "y"))
{
if (str[2] != 'a') /* '^a&ay', '^ay' */
g_free (ptr);
else if (str[1] == 'a') /* '^aay' */
g_strfreev (ptr);
break; /* '^&ay' */
}
else if (str[2] != '&') /* '^as', '^ao' */
g_strfreev (ptr);
else /* '^a&s', '^a&o' */
g_free (ptr);

74
glib/tests/gvariant.c
View File

@ -3115,6 +3115,80 @@ test_varargs (void)
g_free (strv);
}
{
const gchar *strvector[] = {"/hello", "/world", NULL};
const gchar *test_strs[] = {"/foo", "/bar", "/baz" };
GVariantBuilder builder;
GVariantIter *array;
GVariantIter tuple;
const gchar **strv;
gchar **my_strv;
GVariant *value;
gchar *str;
gint i;
g_variant_builder_init (&builder, G_VARIANT_TYPE ("aaay"));
g_variant_builder_add (&builder, "^aay", strvector);
g_variant_builder_add (&builder, "^aay", strvector);
g_variant_builder_add (&builder, "^aay", strvector);
value = g_variant_new ("aaay", &builder);
array = g_variant_iter_new (value);
i = 0;
while (g_variant_iter_loop (array, "^aay", &my_strv))
i++;
g_assert (i == 3);
/* start over */
g_variant_iter_init (array, value);
i = 0;
while (g_variant_iter_loop (array, "^a&ay", &strv))
i++;
g_assert (i == 3);
g_variant_unref (value);
g_variant_iter_free (array);
/* next test */
g_variant_builder_init (&builder, G_VARIANT_TYPE ("aay"));
g_variant_builder_add (&builder, "^ay", "/foo");
g_variant_builder_add (&builder, "^ay", "/bar");
g_variant_builder_add (&builder, "^ay", "/baz");
value = g_variant_new ("(aay^aay^a&ay)", &builder, strvector, strvector);
g_variant_iter_init (&tuple, value);
g_variant_iter_next (&tuple, "aay", &array);
i = 0;
while (g_variant_iter_loop (array, "^ay", &str))
g_assert_cmpstr (str, ==, test_strs[i++]);
g_assert (i == 3);
g_variant_iter_free (array);
/* start over */
g_variant_iter_init (&tuple, value);
g_variant_iter_next (&tuple, "aay", &array);
i = 0;
while (g_variant_iter_loop (array, "^&ay", &str))
g_assert_cmpstr (str, ==, test_strs[i++]);
g_assert (i == 3);
g_variant_iter_free (array);
g_variant_iter_next (&tuple, "^a&ay", &strv);
g_variant_iter_next (&tuple, "^aay", &my_strv);
g_assert_cmpstr (strv[0], ==, "/hello");
g_assert_cmpstr (strv[1], ==, "/world");
g_assert (strv[2] == NULL);
g_assert_cmpstr (my_strv[0], ==, "/hello");
g_assert_cmpstr (my_strv[1], ==, "/world");
g_assert (my_strv[2] == NULL);
g_variant_unref (value);
g_strfreev (my_strv);
g_free (strv);
}
{
const gchar *strvector[] = {"/hello", "/world", NULL};
const gchar *test_strs[] = {"/foo", "/bar", "/baz" };