From patchwork Thu Mar 14 17:25:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 10853351 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 44F3014DE for ; Thu, 14 Mar 2019 17:26:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24D5629352 for ; Thu, 14 Mar 2019 17:26:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13A0828D1A; Thu, 14 Mar 2019 17:26:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B3B6828B72 for ; Thu, 14 Mar 2019 17:26:35 +0000 (UTC) Received: from localhost ([127.0.0.1]:42400 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4U7m-000201-W5 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Mar 2019 13:26:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4U6m-0001JN-OV for qemu-devel@nongnu.org; Thu, 14 Mar 2019 13:25:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4U6l-0007jj-NO for qemu-devel@nongnu.org; Thu, 14 Mar 2019 13:25:32 -0400 Received: from hera.aquilenet.fr ([2a0c:e300::1]:44398) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4U6l-0007iX-D0 for qemu-devel@nongnu.org; Thu, 14 Mar 2019 13:25:31 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id E0DE4DD11; Thu, 14 Mar 2019 18:25:27 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lQO5tBKvoL-f; Thu, 14 Mar 2019 18:25:26 +0100 (CET) Received: from function (dhcp-13-99.lip.ens-lyon.fr [140.77.13.99]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 6F7A1DD12; Thu, 14 Mar 2019 18:25:25 +0100 (CET) Received: from samy by function with local (Exim 4.92) (envelope-from ) id 1h4U6e-0002QZ-Ux; Thu, 14 Mar 2019 18:25:24 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org, kraxel@redhat.com Date: Thu, 14 Mar 2019 18:25:24 +0100 Message-Id: <20190314172524.9290-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a0c:e300::1 Subject: [Qemu-devel] [PATCHv2] curses ui: add missing iconv_close calls X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The iconv_t are opened but never closed. Spotted by Coverity: CID 1399708 Spotted by Coverity: CID 1399709 Spotted by Coverity: CID 1399713 Signed-off-by: Samuel Thibault Reviewed-by: Peter Maydell --- Change since previous version: close all iconv_t, not only ucs_to_wchar_conv. ui/curses.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ui/curses.c b/ui/curses.c index 3a7e8649f3..d29098db9f 100644 --- a/ui/curses.c +++ b/ui/curses.c @@ -519,6 +519,7 @@ static void font_setup(void) wchar_to_ucs_conv = iconv_open("UCS-2", "WCHAR_T"); if (wchar_to_ucs_conv == (iconv_t) -1) { + iconv_close(ucs_to_wchar_conv); fprintf(stderr, "Could not convert font glyphs to UCS-2: '%s'\n", strerror(errno)); exit(1); @@ -526,6 +527,8 @@ static void font_setup(void) font_conv = iconv_open("WCHAR_T", font_charset); if (font_conv == (iconv_t) -1) { + iconv_close(ucs_to_wchar_conv); + iconv_close(wchar_to_ucs_conv); fprintf(stderr, "Could not convert font glyphs from %s: '%s'\n", font_charset, strerror(errno)); exit(1); @@ -646,6 +649,9 @@ static void font_setup(void) } } } + iconv_close(ucs_to_wchar_conv); + iconv_close(wchar_to_ucs_conv); + iconv_close(font_conv); } static void curses_setup(void)