From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3gzL-0003F4-28 for qemu-devel@nongnu.org; Thu, 27 Apr 2017 06:49:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3gzH-00082X-VB for qemu-devel@nongnu.org; Thu, 27 Apr 2017 06:49:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47464) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d3gzH-00082M-Lz for qemu-devel@nongnu.org; Thu, 27 Apr 2017 06:49:27 -0400 From: Markus Armbruster References: <1493282486-28338-1-git-send-email-armbru@redhat.com> <1493282486-28338-5-git-send-email-armbru@redhat.com> Date: Thu, 27 Apr 2017 12:49:24 +0200 In-Reply-To: (=?utf-8?Q?=22Marc-Andr=C3=A9?= Lureau"'s message of "Thu, 27 Apr 2017 09:06:44 +0000") Message-ID: <8760hqceh7.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 4/4] qobject-input-visitor: Catch misuse of end_struct vs. end_list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Cc: qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com Marc-Andr=C3=A9 Lureau writes: > On Thu, Apr 27, 2017 at 12:41 PM Markus Armbruster > wrote: > >> Signed-off-by: Markus Armbruster >> > > It would be more obvious with a check for qobject_type(tos->obj), no? --verbose? > In any case: > Reviewed-by: Marc-Andr=C3=A9 Lureau Thanks! >> --- >> qapi/qobject-input-visitor.c | 21 +++++++++++++++++++-- >> 1 file changed, 19 insertions(+), 2 deletions(-) >> >> diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c >> index 2530959..68a6742 100644 >> --- a/qapi/qobject-input-visitor.c >> +++ b/qapi/qobject-input-visitor.c >> @@ -291,6 +291,15 @@ static void qobject_input_start_struct(Visitor *v, >> const char *name, void **obj, >> } >> } >> >> +static void qobject_input_end_struct(Visitor *v, void **obj) >> +{ >> + QObjectInputVisitor *qiv =3D to_qiv(v); >> + StackObject *tos =3D QSLIST_FIRST(&qiv->stack); >> + >> + assert(tos->h); >> + qobject_input_pop(v, obj); >> +} >> + >> >> static void qobject_input_start_list(Visitor *v, const char *name, >> GenericList **list, size_t size, >> @@ -346,6 +355,14 @@ static void qobject_input_check_list(Visitor *v, >> Error **errp) >> } >> } >> >> +static void qobject_input_end_list(Visitor *v, void **obj) >> +{ >> + QObjectInputVisitor *qiv =3D to_qiv(v); >> + StackObject *tos =3D QSLIST_FIRST(&qiv->stack); >> + >> + assert(!tos->h); >> + qobject_input_pop(v, obj); >> +} >> >> static void qobject_input_start_alternate(Visitor *v, const char *name, >> GenericAlternate **obj, size_t >> size, >> @@ -645,11 +662,11 @@ static QObjectInputVisitor >> *qobject_input_visitor_base_new(QObject *obj) >> v->visitor.type =3D VISITOR_INPUT; >> v->visitor.start_struct =3D qobject_input_start_struct; >> v->visitor.check_struct =3D qobject_input_check_struct; >> - v->visitor.end_struct =3D qobject_input_pop; >> + v->visitor.end_struct =3D qobject_input_end_struct; >> v->visitor.start_list =3D qobject_input_start_list; >> v->visitor.next_list =3D qobject_input_next_list; >> v->visitor.check_list =3D qobject_input_check_list; >> - v->visitor.end_list =3D qobject_input_pop; >> + v->visitor.end_list =3D qobject_input_end_list; >> v->visitor.start_alternate =3D qobject_input_start_alternate; >> v->visitor.optional =3D qobject_input_optional; >> v->visitor.free =3D qobject_input_free; >> -- >> 2.7.4 >> >> >> -- > Marc-Andr=C3=A9 Lureau