From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bnAmP-0000NE-Bf for qemu-devel@nongnu.org; Thu, 22 Sep 2016 16:39:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bnAmN-0001Ws-8R for qemu-devel@nongnu.org; Thu, 22 Sep 2016 16:39:36 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Fri, 23 Sep 2016 00:39:25 +0400 Message-Id: <20160922203927.28241-2-marcandre.lureau@redhat.com> In-Reply-To: <20160922203927.28241-1-marcandre.lureau@redhat.com> References: <20160922203927.28241-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 1/3] qmp: fix object-add assert() without props List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: paolo.bonzini@gmail.com, berrange@redhat.com, qemu-stable@nongnu.org, eblake@redhat.com, armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Since commit ad739706bbadee49, user_creatable_add_type() expects to be given a qdict. However, if object-add is called without props, you reach the assert: "qemu/qom/object_interfaces.c:115: user_creatable_add_type: Assertion `qdict' failed.", because the qdict isn't created in this case (it's optional). Furthermore, qmp_input_visitor_new() is not meant to be called without a dict, and a further commit will assert in this situation. If none given, create an empty qdict in qmp to avoid the user_creatable_add_type() assert(qdict). Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake --- qmp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qmp.c b/qmp.c index 6733463..b6de482 100644 --- a/qmp.c +++ b/qmp.c @@ -665,7 +665,7 @@ void qmp_add_client(const char *protocol, const char = *fdname, void qmp_object_add(const char *type, const char *id, bool has_props, QObject *props, Error **errp) { - const QDict *pdict =3D NULL; + QDict *pdict; Visitor *v; Object *obj; =20 @@ -675,14 +675,18 @@ void qmp_object_add(const char *type, const char *i= d, error_setg(errp, QERR_INVALID_PARAMETER_TYPE, "props", "dict= "); return; } + QINCREF(pdict); + } else { + pdict =3D qdict_new(); } =20 - v =3D qmp_input_visitor_new(props, true); + v =3D qmp_input_visitor_new(QOBJECT(pdict), true); obj =3D user_creatable_add_type(type, id, pdict, v, errp); visit_free(v); if (obj) { object_unref(obj); } + QDECREF(pdict); } =20 void qmp_object_del(const char *id, Error **errp) --=20 2.10.0