From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVaS4-0002Vk-3G for qemu-devel@nongnu.org; Fri, 05 Aug 2016 04:25:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVaS1-0002Ls-LA for qemu-devel@nongnu.org; Fri, 05 Aug 2016 04:25:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50370) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVaS1-0002LD-EF for qemu-devel@nongnu.org; Fri, 05 Aug 2016 04:25:53 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (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 F29048111C for ; Fri, 5 Aug 2016 08:25:52 +0000 (UTC) From: marcandre.lureau@redhat.com Date: Fri, 5 Aug 2016 12:24:03 +0400 Message-Id: <20160805082421.21994-19-marcandre.lureau@redhat.com> In-Reply-To: <20160805082421.21994-1-marcandre.lureau@redhat.com> References: <20160805082421.21994-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 v4 18/36] acpi-build: fix array leak List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, eblake@redhat.com, armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau The free_ranges array is used as a temporary pointer array, the segment should still be freed, however, it shouldn't free the elements themself. Signed-off-by: Marc-Andr=C3=A9 Lureau Tested-by: Marcel Apfelbaum Reviewed-by: Marcel Apfelbaum --- hw/i386/acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index a26a4bb..433feba 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -789,7 +789,7 @@ static gint crs_range_compare(gconstpointer a, gconst= pointer b) static void crs_replace_with_free_ranges(GPtrArray *ranges, uint64_t start, uint64_t end) { - GPtrArray *free_ranges =3D g_ptr_array_new_with_free_func(crs_range_= free); + GPtrArray *free_ranges =3D g_ptr_array_new(); uint64_t free_base =3D start; int i; =20 @@ -813,7 +813,7 @@ static void crs_replace_with_free_ranges(GPtrArray *r= anges, g_ptr_array_add(ranges, g_ptr_array_index(free_ranges, i)); } =20 - g_ptr_array_free(free_ranges, false); + g_ptr_array_free(free_ranges, true); } =20 /* --=20 2.9.0