From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49693) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f8QmX-0005tN-Lt for qemu-devel@nongnu.org; Tue, 17 Apr 2018 09:36:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f8QmT-0002Zg-5K for qemu-devel@nongnu.org; Tue, 17 Apr 2018 09:36:25 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50226 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f8QmT-0002ZK-0W for qemu-devel@nongnu.org; Tue, 17 Apr 2018 09:36:21 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 92194406E8B9 for ; Tue, 17 Apr 2018 13:36:20 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 17 Apr 2018 15:36:02 +0200 Message-Id: <20180417133602.23832-6-marcandre.lureau@redhat.com> In-Reply-To: <20180417133602.23832-1-marcandre.lureau@redhat.com> References: <20180417133602.23832-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 v5 5/5] qobject: modify qobject_ref() to assert on NULL List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: eblake@redhat.com, berrange@redhat.com, armbru@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= While it may be convenient to accept NULL value in qobject_unref() (for similar reasons as free() accepts NULL), it is not such a good idea for qobject_ref(), assert() on NULL. One place relied on that behaviour (the monitor request id), and it's best to be explicit that NULL is accepted there. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/qapi/qmp/qobject.h | 7 ++++--- monitor.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/qapi/qmp/qobject.h b/include/qapi/qmp/qobject.h index befc945504..a0b2affb2c 100644 --- a/include/qapi/qmp/qobject.h +++ b/include/qapi/qmp/qobject.h @@ -73,9 +73,8 @@ static inline void qobject_init(QObject *obj, QType typ= e) =20 static inline void *qobject_ref_impl(QObject *obj) { - if (obj) { - obj->base.refcnt++; - } + assert(obj); + obj->base.refcnt++; return obj; } =20 @@ -103,6 +102,7 @@ static inline void qobject_unref_impl(QObject *obj) =20 /** * qobject_ref(): Increment QObject's reference count + * @obj: a #QObject or child type instance (must not be NULL) * * Returns: the same @obj. The type of @obj will be propagated to the * return type. @@ -112,6 +112,7 @@ static inline void qobject_unref_impl(QObject *obj) /** * qobject_unref(): Decrement QObject's reference count, deallocate * when it reaches zero + * @obj: a #QObject or children type instance (can be NULL) */ #define qobject_unref(obj) qobject_unref_impl(QOBJECT(obj)) =20 diff --git a/monitor.c b/monitor.c index 7dbc1f74b8..3a750208fd 100644 --- a/monitor.c +++ b/monitor.c @@ -4188,7 +4188,7 @@ static void handle_qmp_command(JSONMessageParser *p= arser, GQueue *tokens) =20 req_obj =3D g_new0(QMPRequest, 1); req_obj->mon =3D mon; - req_obj->id =3D qobject_ref(id); + req_obj->id =3D id ? qobject_ref(id) : NULL; req_obj->req =3D req; req_obj->need_resume =3D false; =20 --=20 2.17.0.rc1.36.gcedb63ea2f