[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/23] qmp-input: Don't consume input when checking h
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 07/23] qmp-input: Don't consume input when checking has_member |
Date: |
Thu, 12 May 2016 09:58:54 +0200 |
From: Eric Blake <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
qapi/qmp-input-visitor.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index c3c3271..cae6387 100644
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -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;
--
2.5.5
- [Qemu-devel] [PULL 00/23] QAPI patches for 2016-05-12, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 09/23] qom: Wrap prop visit in visit_start_struct, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 10/23] qmp-input: Require struct push to visit members of top dict, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 03/23] qmp: Drop dead command->type, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 01/23] qapi-visit: Add visitor.type classification, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 06/23] qapi: Use strict QMP input visitor in more places, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 07/23] qmp-input: Don't consume input when checking has_member,
Markus Armbruster <=
- [Qemu-devel] [PULL 18/23] qmp: Tighten output visitor rules, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 05/23] qapi: Consolidate QMP input visitor creation, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 02/23] qapi: Guarantee NULL obj on input visitor callback error, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 21/23] qapi: Fix string input visitor handling of invalid list, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 20/23] tests/string-input-visitor: Add negative integer tests, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 14/23] qapi: Add visit_type_null() visitor, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 17/23] qmp: Don't reuse qmp visitor after grabbing output, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 13/23] tests: Add check-qnull, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 23/23] qapi: Change visit_type_FOO() to no longer return partial objects, Markus Armbruster, 2016/05/12
- [Qemu-devel] [PULL 04/23] qmp-input: Clean up stack handling, Markus Armbruster, 2016/05/12