From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUxaz-0008Tb-Lf for qemu-devel@nongnu.org; Wed, 03 Aug 2016 10:56:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUxax-0001Ko-BF for qemu-devel@nongnu.org; Wed, 03 Aug 2016 10:56:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53498) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUxax-0001Kk-5f for qemu-devel@nongnu.org; Wed, 03 Aug 2016 10:56:31 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AFFBA81127 for ; Wed, 3 Aug 2016 14:56:30 +0000 (UTC) From: marcandre.lureau@redhat.com Date: Wed, 3 Aug 2016 18:55:19 +0400 Message-Id: <20160803145541.15355-15-marcandre.lureau@redhat.com> In-Reply-To: <20160803145541.15355-1-marcandre.lureau@redhat.com> References: <20160803145541.15355-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 for-2.7 v3 14/36] numa: do not leak NumaOptions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, eblake@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau In all cases, call qapi_free_NumaOptions(), by using a common ending block. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake --- numa.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/numa.c b/numa.c index cbae430..3be3b26 100644 --- a/numa.c +++ b/numa.c @@ -223,14 +223,14 @@ static int parse_numa(void *opaque, QemuOpts *opts,= Error **errp) } =20 if (err) { - goto error; + goto end; } =20 switch (object->type) { case NUMA_OPTIONS_KIND_NODE: numa_node_parse(object->u.node.data, opts, &err); if (err) { - goto error; + goto end; } nb_numa_nodes++; break; @@ -238,13 +238,14 @@ static int parse_numa(void *opaque, QemuOpts *opts,= Error **errp) abort(); } =20 - return 0; - -error: - error_report_err(err); +end: qapi_free_NumaOptions(object); + if (err) { + error_report_err(err); + return -1; + } =20 - return -1; + return 0; } =20 static char *enumerate_cpus(unsigned long *cpus, int max_cpus) --=20 2.9.0