From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acLyW-0008Pv-TF for qemu-devel@nongnu.org; Sat, 05 Mar 2016 18:51:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1acLyU-0005lC-I1 for qemu-devel@nongnu.org; Sat, 05 Mar 2016 18:51:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51421) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acLyU-0005ku-Cz for qemu-devel@nongnu.org; Sat, 05 Mar 2016 18:51:06 -0500 From: Eric Blake Date: Sat, 5 Mar 2016 16:50:48 -0700 Message-Id: <1457221861-18067-6-git-send-email-eblake@redhat.com> In-Reply-To: <1457221861-18067-1-git-send-email-eblake@redhat.com> References: <1457221861-18067-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v13 05/18] qmp-input: Don't consume input when checking has_member List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, Michael Roth Commit e8316d7 mistakenly passed consume=true 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. Tighten up the input visitor to ensure that a member is consumed exactly once. To keep the testsuite happy in the case of incomplete input, we have to check whether a member exists in the dictionary before trying to remove it. Signed-off-by: Eric Blake --- v13: no change v12: new patch --- qapi/qmp-input-visitor.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c index 7428d15..4bb7b21 100644 --- a/qapi/qmp-input-visitor.c +++ b/qapi/qmp-input-visitor.c @@ -64,10 +64,12 @@ static QObject *qmp_input_get_object(QmpInputVisitor *qiv, /* 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); + qobj = qdict_get(qobject_to_qdict(qobj), name); + if (tos->h && consume && qobj) { + bool removed = g_hash_table_remove(tos->h, name); + assert(removed); } - return qdict_get(qobject_to_qdict(qobj), name); + return qobj; } /* If we are in the middle of a list, then return the next element @@ -337,7 +339,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.0