yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 13:15:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

qmp-input: Don't consume input when checking has_member

Browse source 
Commit e8316d7 mistakenly passed consume=true within
qmp_input_optional() when checking if an optional member was
present, but the mistake was silently ignored since the code
happily let us extract a member more than once. Fix
qmp_input_optional() to not consume anything, then tighten up
the input visitor to ensure that a member is consumed exactly
once (all generated code follows this pattern; and the new
assert will catch any hand-written code that tries to visit
the same key more than once).

Backports commit e5826a2fd727f0be54a81083f31fe02a275465cd from qemu
This commit is contained in:
Eric Blake 2018-02-23 15:12:55 -05:00 committed by Lioncash
parent cae9c2bd2d
commit 1bb4e4c787
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
qemu/qapi/qmp-input-visitor.c
View file

@ -55,16 +55,19 @@ static QObject *qmp_input_get_object(QmpInputVisitor *qiv,
{ {
StackObject *tos = &qiv->stack[qiv->nb_stack - 1]; StackObject *tos = &qiv->stack[qiv->nb_stack - 1];
QObject *qobj = tos->obj; QObject *qobj = tos->obj;
QObject *ret;
assert(qobj); assert(qobj);
/* If we have a name, and we're in a dictionary, then return that /* If we have a name, and we're in a dictionary, then return that
* value. */ * value. */
if (name && qobject_type(qobj) == QTYPE_QDICT) { if (name && qobject_type(qobj) == QTYPE_QDICT) {
if (tos->h && consume) { ret = qdict_get(qobject_to_qdict(qobj), name);
g_hash_table_remove(tos->h, name); if (tos->h && consume && ret) {
bool removed = g_hash_table_remove(tos->h, name);
assert(removed);
} }
return qdict_get(qobject_to_qdict(qobj), name); return ret;
} }
/* If we are in the middle of a list, then return the next element /* If we are in the middle of a list, then return the next element
@ -139,7 +142,7 @@ static void qmp_input_start_struct(Visitor *v, const char *name, void **obj,
size_t size, Error **errp) size_t size, Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true); QObject *qobj = qmp_input_get_object(qiv, name, false);
Error *err = NULL; Error *err = NULL;
if (obj) { if (obj) {