luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-31 12:53:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

GVariant parser: fix tuple type checking

Browse Source 
Robert Ancell discovered that the GVariant parser messes up pretty badly
when the type of a tuple is specified and the tuple in the text being
parsed has a different number of elements (but otherwise matching child
types).

Check that we have the expected number of elements.

Closes #644786.
This commit is contained in:
Ryan Lortie 2011-03-15 01:29:52 -04:00
parent a7fc7909da
commit d679a7659f
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glib/gvariant-parser.c
View File

@ -1014,6 +1014,12 @@ tuple_get_value (AST *ast,
{ {
GVariant *child; GVariant *child;
if (childtype == NULL)
{
g_variant_builder_clear (&builder);
return ast_type_error (ast, type, error);
}
if (!(child = ast_get_value (tuple->children[i], childtype, error))) if (!(child = ast_get_value (tuple->children[i], childtype, error)))
{ {
g_variant_builder_clear (&builder); g_variant_builder_clear (&builder);
@ -1024,6 +1030,12 @@ tuple_get_value (AST *ast,
childtype = g_variant_type_next (childtype); childtype = g_variant_type_next (childtype);
} }
if (childtype != NULL)
{
g_variant_builder_clear (&builder);
return ast_type_error (ast, type, error);
}
return g_variant_builder_end (&builder); return g_variant_builder_end (&builder);
} }