Commit 8b2e41d7 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1493282486-28338-5-git-send-email-armbru@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
[More elaborate assertions for clarity]
parent ed0ba0f4

qapi/qobject-input-visitor.c

+19 −2
Original line number Diff line number Diff line
@@ -291,6 +291,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,
@@ -346,6 +355,14 @@ 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,
@@ -645,11 +662,11 @@ 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_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.start_alternate = qobject_input_start_alternate;

    v->visitor.optional = qobject_input_optional;

    v->visitor.free = qobject_input_free;