From patchwork Sat Mar 5 23:50:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 8511821 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 05515C0553 for ; Sat, 5 Mar 2016 23:51:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 52978201EF for ; Sat, 5 Mar 2016 23:51:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A664B201EC for ; Sat, 5 Mar 2016 23:51:28 +0000 (UTC) Received: from localhost ([::1]:48459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acLyq-00006n-2K for patchwork-qemu-devel@patchwork.kernel.org; Sat, 05 Mar 2016 18:51:28 -0500 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 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id F297F7AE80; Sat, 5 Mar 2016 23:51:05 +0000 (UTC) Received: from red.redhat.com (ovpn-113-165.phx2.redhat.com [10.3.113.165]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u25Np3ZE020509; Sat, 5 Mar 2016 18:51:05 -0500 From: Eric Blake To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: armbru@redhat.com, Michael Roth Subject: [Qemu-devel] [PATCH v13 05/18] qmp-input: Don't consume input when checking has_member X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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;