Commit e5826a2f authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

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



Commit e8316d7e 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: default avatarEric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-8-git-send-email-eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 240f64b6

qapi/qmp-input-visitor.c

+7 −4
Original line number Diff line number Diff line
@@ -56,16 +56,19 @@ static QObject *qmp_input_get_object(QmpInputVisitor *qiv, 
{

    StackObject *tos = &qiv->stack[qiv->nb_stack - 1];

    QObject *qobj = tos->obj;

    QObject *ret;



    assert(qobj);



    /* If we have a name, and we're in a dictionary, then return that

     * value. */

    if (name && qobject_type(qobj) == QTYPE_QDICT) {

        if (tos->h && consume) {

            g_hash_table_remove(tos->h, name);

        ret = qdict_get(qobject_to_qdict(qobj), 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
@@ -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)

{

    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) {

        *present = false;