From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdbnR-0003tB-Av for qemu-devel@nongnu.org; Thu, 02 Apr 2015 05:52:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdbnQ-0007Uq-Fs for qemu-devel@nongnu.org; Thu, 02 Apr 2015 05:52:21 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:33293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdbnQ-0007UX-9h for qemu-devel@nongnu.org; Thu, 02 Apr 2015 05:52:20 -0400 From: Peter Maydell Date: Thu, 2 Apr 2015 10:52:14 +0100 Message-Id: <1427968334-14527-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH for-2.3] hw/arm/vexpress: Don't double-free flash filename List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Weil , Gonglei , Michael Tokarev , Shannon Zhao , patches@linaro.org Commits 6e05a12f8f7f and db25a1581 both attempt to fix the same "failed to free memory containing flash filename" bug, with the effect that when they were both applied we ended up freeing the memory twice. Delete the spurious extra free. Signed-off-by: Peter Maydell --- Shannon's patch fixes the virt.c board; I checked the other boards touched by 6e05a12f8f7f and they don't have the problem (either due to no conflicting patch or because the g_free() calls were in the same place and the merge combined them.) hw/arm/vexpress.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index dd04527..54dd967 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -583,7 +583,6 @@ static void vexpress_common_init(MachineState *machine) error_report("Could not load ROM image '%s'", bios_name); exit(1); } - g_free(fn); } /* Motherboard peripherals: the wiring is the same but the -- 1.9.1