mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 19:36:18 +01:00
Merge branch 'gvariant' into 'master'
Fix ^*ay handling in g_variant_iter_loop() See merge request GNOME/glib!417
This commit is contained in:
commit
da790bc6da
@ -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);
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user