From patchwork Mon May 6 21:59:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 241800 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 4A26C2C00D0 for ; Tue, 7 May 2013 07:59:16 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UZTRD-0006w2-6T; Mon, 06 May 2013 21:59:15 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UZTR7-0006vx-VY for fwts-devel@lists.ubuntu.com; Mon, 06 May 2013 21:59:09 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginmedia.com ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1UZTR7-0002WV-SU for fwts-devel@lists.ubuntu.com; Mon, 06 May 2013 21:59:09 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] lib: fwts_keymap: free keymap_list on error Date: Mon, 6 May 2013 22:59:09 +0100 Message-Id: <1367877549-17529-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.8.1.2 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King Coverity CID #997344, Resource leak. Need to free keymap_list before we return Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/lib/src/fwts_keymap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/src/fwts_keymap.c b/src/lib/src/fwts_keymap.c index 71800fc..646cdfa 100644 --- a/src/lib/src/fwts_keymap.c +++ b/src/lib/src/fwts_keymap.c @@ -62,8 +62,10 @@ fwts_list *fwts_keymap_load(const char *machine) snprintf(path, sizeof(path), "%s/%s", FWTS_KEYMAP_PATH, machine); - if ((fp = fopen(path, "r")) == NULL) + if ((fp = fopen(path, "r")) == NULL) { + fwts_keymap_free(keymap_list); return NULL; + } while (fgets(buffer, sizeof(buffer), fp) != NULL) { fwts_keycode *key;