[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/28] qobject-input-visitor: Catch misuse of end_str
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 23/28] qobject-input-visitor: Catch misuse of end_struct vs. end_list |
Date: |
Thu, 4 May 2017 17:24:00 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
[More elaborate assertions for clarity]
---
qapi/qobject-input-visitor.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index 2530959..d0f0002 100644
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -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;
--
2.7.4
- [Qemu-devel] [PULL 20/28] qmp: Improve QMP dispatch error messages, (continued)
- [Qemu-devel] [PULL 20/28] qmp: Improve QMP dispatch error messages, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 26/28] qmp-shell: Cope with query-commands error, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 12/28] test-qga: Actually test 0xff sync bytes, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 27/28] qmp-shell: don't show version greeting if unavailable, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 15/28] qapi: New QAPI_CLONE_MEMBERS(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 19/28] sockets: Delete unused helper socket_address_crumple(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 14/28] sockets: Prepare inet_parse() for flattened SocketAddress, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 06/28] qobject: Drop useless QObject casts, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 25/28] qmp-shell: add -N option to skip negotiate, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 24/28] qmp-shell: add persistent command history, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 23/28] qobject-input-visitor: Catch misuse of end_struct vs. end_list,
Markus Armbruster <=
- [Qemu-devel] [PULL 08/28] qobject: Use simpler QDict/QList scalar insertion macros, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 13/28] sockets: Prepare vsock_parse() for flattened SocketAddress, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 16/28] sockets: Rename SocketAddress to SocketAddressLegacy, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 28/28] qmp-shell: improve help, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 17/28] sockets: Rename SocketAddressFlat to SocketAddress, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 18/28] sockets: Limit SocketAddressLegacy to external interfaces, Markus Armbruster, 2017/05/04
- Re: [Qemu-devel] [PULL 00/28] QAPI patches for 2017-05-04, no-reply, 2017/05/04