From patchwork Mon Oct 3 15:22:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Jarosch X-Patchwork-Id: 117461 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A6CDCB6F6B for ; Tue, 4 Oct 2011 02:26:20 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756475Ab1JCP0P (ORCPT ); Mon, 3 Oct 2011 11:26:15 -0400 Received: from re04.intra2net.com ([82.165.46.26]:39568 "EHLO re04.intra2net.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755088Ab1JCP0O (ORCPT ); Mon, 3 Oct 2011 11:26:14 -0400 Received: from intranator.m.i2n (unknown [172.16.1.99]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by re04.intra2net.com (Postfix) with ESMTP id 71724300D2 for ; Mon, 3 Oct 2011 17:26:13 +0200 (CEST) Received: from localhost (intranator.m.i2n [127.0.0.1]) by localhost (Postfix) with ESMTP id 3D0752AC59 for ; Mon, 3 Oct 2011 17:26:13 +0200 (CEST) X-Virus-Scanned: by Intranator (www.intra2net.com) with AMaViS and F-Secure AntiVirus (fsavdb 2011-10-03_03) X-Spam-Status: X-Spam-Level: 0 Received: from pikkukde.a.i2n (unknown [192.168.12.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by intranator.m.i2n (Postfix) with ESMTPS id 4D1232AC57 for ; Mon, 3 Oct 2011 17:26:12 +0200 (CEST) Message-ID: <4E89D342.80801@intra2net.com> Date: Mon, 03 Oct 2011 17:22:42 +0200 From: Thomas Jarosch User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.22) Gecko/20110906 Fedora/3.1.14-1.fc14 Thunderbird/3.1.14 MIME-Version: 1.0 To: netdev@vger.kernel.org Subject: [iproute2 PATCH 02/11] Fix file descriptor leak on error in rtnl_hash_initialize() Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Detected by cppcheck. Signed-off-by: Thomas Jarosch --- lib/rt_names.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/lib/rt_names.c b/lib/rt_names.c index 30d43cd..a290021 100644 --- a/lib/rt_names.c +++ b/lib/rt_names.c @@ -54,6 +54,7 @@ rtnl_hash_initialize(char *file, struct rtnl_hash_entry **hash, int size) sscanf(p, "%d %s #", &id, namebuf) != 2) { fprintf(stderr, "Database %s is corrupted at %s\n", file, p); + fclose(fp); return; } @@ -91,6 +92,7 @@ static void rtnl_tab_initialize(char *file, char **tab, int size) sscanf(p, "%d %s #", &id, namebuf) != 2) { fprintf(stderr, "Database %s is corrupted at %s\n", file, p); + fclose(fp); return; }