mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests 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).

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-8-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2016-04-28 15:45:15 -06:00 committed by Markus Armbruster
parent 240f64b6dc
commit e5826a2fd7
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qapi/qmp-input-visitor.c
View File

@ -56,16 +56,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
@ -335,7 +338,7 @@ static void qmp_input_type_any(Visitor *v, const char *name, QObject **obj,
static void qmp_input_optional(Visitor *v, const char *name, bool *present) static void qmp_input_optional(Visitor *v, const char *name, bool *present)
{ {
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);
if (!qobj) { if (!qobj) {
*present = false; *present = false;