From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flbMh-0002iY-Cq for qemu-devel@nongnu.org; Fri, 03 Aug 2018 10:47:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1flbMe-0007fX-Oz for qemu-devel@nongnu.org; Fri, 03 Aug 2018 10:47:37 -0400 From: Stefan Hajnoczi Date: Fri, 3 Aug 2018 15:47:18 +0100 Message-Id: <20180803144721.17036-4-stefanha@redhat.com> In-Reply-To: <20180803144721.17036-1-stefanha@redhat.com> References: <20180803144721.17036-1-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v4 3/6] loader: extract rom_free() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jim@groklearning.com, Joel Stanley , Peter Maydell , Subbaraya Sundeep , qemu-arm@nongnu.org, jusual@mail.ru, Alistair Francis , mail@steffen-goertz.de, ilg@livius.net, Su Hang , Steffen Gortz , Stefan Hajnoczi The next patch will need to free a rom. There is already code to do this in rom_add_file(). Note that rom_add_file() uses: rom = g_malloc0(sizeof(*rom)); ... if (rom->fw_dir) { g_free(rom->fw_dir); g_free(rom->fw_file); } The conditional is unnecessary since g_free(NULL) is a no-op. Signed-off-by: Stefan Hajnoczi --- hw/core/loader.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index bbb6e65bb5..0c72e7c05a 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -847,6 +847,17 @@ struct Rom { static FWCfgState *fw_cfg; static QTAILQ_HEAD(, Rom) roms = QTAILQ_HEAD_INITIALIZER(roms); +/* rom->data must be heap-allocated (do not use with rom_add_elf_program()) */ +static void rom_free(Rom *rom) +{ + g_free(rom->data); + g_free(rom->path); + g_free(rom->name); + g_free(rom->fw_dir); + g_free(rom->fw_file); + g_free(rom); +} + static inline bool rom_order_compare(Rom *rom, Rom *item) { return ((uintptr_t)(void *)rom->as > (uintptr_t)(void *)item->as) || @@ -995,15 +1006,7 @@ err: if (fd != -1) close(fd); - g_free(rom->data); - g_free(rom->path); - g_free(rom->name); - if (fw_dir) { - g_free(rom->fw_dir); - g_free(rom->fw_file); - } - g_free(rom); - + rom_free(rom); return -1; } -- 2.17.1