From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=46132 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PbdSx-0006FG-IA for qemu-devel@nongnu.org; Sat, 08 Jan 2011 13:24:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PbdSw-0006u4-FC for qemu-devel@nongnu.org; Sat, 08 Jan 2011 13:24:39 -0500 Received: from mail-pz0-f45.google.com ([209.85.210.45]:62429) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PbdSw-0006qZ-9T for qemu-devel@nongnu.org; Sat, 08 Jan 2011 13:24:38 -0500 Received: by mail-pz0-f45.google.com with SMTP id 2so4199800pzk.4 for ; Sat, 08 Jan 2011 10:24:37 -0800 (PST) MIME-Version: 1.0 From: Blue Swirl Date: Sat, 8 Jan 2011 18:24:17 +0000 Message-ID: Content-Type: text/plain; charset=UTF-8 Subject: [Qemu-devel] [PATCH 2/7] loader: fix a file descriptor leak List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Fix a file descriptor leak, reported by cppcheck: [/src/qemu/hw/loader.c:311]: (error) Resource leak: fd Signed-off-by: Blue Swirl --- hw/loader.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index eb198f6..35d792e 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -307,8 +307,9 @@ int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t), target_data_order = ELFDATA2LSB; } - if (target_data_order != e_ident[EI_DATA]) - return -1; + if (target_data_order != e_ident[EI_DATA]) { + goto fail; + } lseek(fd, 0, SEEK_SET); if (e_ident[EI_CLASS] == ELFCLASS64) { -- 1.6.2.4