From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgCpe-0002ib-Fb for qemu-devel@nongnu.org; Fri, 02 May 2014 08:44:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgCpY-0001Ng-8I for qemu-devel@nongnu.org; Fri, 02 May 2014 08:44:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1322) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgCpY-0001NI-0L for qemu-devel@nongnu.org; Fri, 02 May 2014 08:44:44 -0400 From: Markus Armbruster Date: Fri, 2 May 2014 14:44:31 +0200 Message-Id: <1399034675-17844-10-git-send-email-armbru@redhat.com> In-Reply-To: <1399034675-17844-1-git-send-email-armbru@redhat.com> References: <1399034675-17844-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 09/13] hmp: Call visit_end_struct() after visit_start_struct() succeeds List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com, pbonzini@redhat.com, akong@redhat.com, vilanova@ac.upc.edu When visit_start_struct() succeeds, visit_end_struct() must be called. hmp_object_add() doesn't when a member visit fails. As far as I can tell, the opts visitor copes okay with the misuse. Fix it anyway. Signed-off-by: Markus Armbruster --- hmp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hmp.c b/hmp.c index ad31ceb..a7cd59e 100644 --- a/hmp.c +++ b/hmp.c @@ -1384,6 +1384,7 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict) void hmp_object_add(Monitor *mon, const QDict *qdict) { Error *err = NULL; + Error *err_end = NULL; QemuOpts *opts; char *type = NULL; char *id = NULL; @@ -1407,24 +1408,23 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) qdict_del(pdict, "qom-type"); visit_type_str(opts_get_visitor(ov), &type, "qom-type", &err); if (err) { - goto out_clean; + goto out_end; } qdict_del(pdict, "id"); visit_type_str(opts_get_visitor(ov), &id, "id", &err); if (err) { - goto out_clean; + goto out_end; } object_add(type, id, pdict, opts_get_visitor(ov), &err); - if (err) { - goto out_clean; - } - visit_end_struct(opts_get_visitor(ov), &err); - if (err) { + +out_end: + visit_end_struct(opts_get_visitor(ov), &err_end); + if (!err && err_end) { qmp_object_del(id, NULL); } - + error_propagate(&err, err_end); out_clean: opts_visitor_cleanup(ov); -- 1.8.1.4