yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-08 22:25:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qobject-input-visitor: Catch misuse of end_struct vs. end_list

Browse source 
Backports commit 8b2e41d733850ec6a67a85743138e023cbb8921b from qemu
This commit is contained in:
Markus Armbruster 2018-03-03 17:38:14 -05:00 committed by Lioncash
parent e9174563be
commit 0d433af617
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
qemu/qapi/qobject-input-visitor.c
View file

@ -241,6 +241,15 @@ static void qobject_input_start_struct(Visitor *v, const char *name, void **obj,
}
}
static void qobject_input_end_struct(Visitor *v, void **obj)
{
QObjectInputVisitor *qiv = to_qiv(v);
StackObject *tos = QSLIST_FIRST(&qiv->stack);
assert(qobject_type(tos->obj) == QTYPE_QDICT && tos->h);
qobject_input_pop(v, obj);
}
static void qobject_input_start_list(Visitor *v, const char *name,
GenericList **list, size_t size, Error **errp)
{
@ -294,6 +303,15 @@ static void qobject_input_check_list(Visitor *v, Error **errp)
}
}
static void qobject_input_end_list(Visitor *v, void **obj)
{
QObjectInputVisitor *qiv = to_qiv(v);
StackObject *tos = QSLIST_FIRST(&qiv->stack);
assert(qobject_type(tos->obj) == QTYPE_QLIST && !tos->h);
qobject_input_pop(v, obj);
}
static void qobject_input_start_alternate(Visitor *v, const char *name,
GenericAlternate **obj, size_t size,
bool promote_int, Error **errp)
@ -491,12 +509,12 @@ static QObjectInputVisitor *qobject_input_visitor_base_new(QObject *obj)
v->visitor.type = VISITOR_INPUT;
v->visitor.start_struct = qobject_input_start_struct;
v->visitor.check_struct = qobject_input_check_struct;
v->visitor.end_struct = qobject_input_pop;
v->visitor.end_struct = qobject_input_end_struct;
v->visitor.start_alternate = qobject_input_start_alternate;
v->visitor.start_list = qobject_input_start_list;
v->visitor.next_list = qobject_input_next_list;
v->visitor.check_list = qobject_input_check_list;
v->visitor.end_list = qobject_input_pop;
v->visitor.end_list = qobject_input_end_list;
v->visitor.optional = qobject_input_optional;
v->visitor.free = qobject_input_free;