From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmetO-0005mB-1U for qemu-devel@nongnu.org; Wed, 21 Sep 2016 06:36:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmetM-0005EJ-6c for qemu-devel@nongnu.org; Wed, 21 Sep 2016 06:36:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmetM-0005E8-04 for qemu-devel@nongnu.org; Wed, 21 Sep 2016 06:36:40 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 21 Sep 2016 14:36:28 +0400 Message-Id: <20160921103629.6410-3-marcandre.lureau@redhat.com> In-Reply-To: <20160921103629.6410-1-marcandre.lureau@redhat.com> References: <20160921103629.6410-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 2/3] qapi: clear given pointer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: berto@igalia.com, eblake@redhat.com, armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Some getters already set *obj argument to NULL early, let's do this for all for consistent behaviour in case of errors. Signed-off-by: Marc-Andr=C3=A9 Lureau --- qapi/qmp-input-visitor.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c index ea9972d..cb9d196 100644 --- a/qapi/qmp-input-visitor.c +++ b/qapi/qmp-input-visitor.c @@ -322,11 +322,13 @@ static void qmp_input_type_str(Visitor *v, const ch= ar *name, char **obj, QObject *qobj =3D qmp_input_get_object(qiv, name, true, errp); QString *qstr =3D qobject_to_qstring(qobj); =20 + if (obj) { + *obj =3D NULL; + } if (!qobj) { return; } if (!qstr) { - *obj =3D NULL; error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "nul= l", "string"); return; @@ -368,6 +370,9 @@ static void qmp_input_type_any(Visitor *v, const char= *name, QObject **obj, QmpInputVisitor *qiv =3D to_qiv(v); QObject *qobj =3D qmp_input_get_object(qiv, name, true, errp); =20 + if (obj) { + *obj =3D NULL; + } if (!qobj) { return; } --=20 2.10.0