From owner-svn-src-stable-7@FreeBSD.ORG  Thu Aug 11 15:22:46 2011
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7AB23106566C;
	Thu, 11 Aug 2011 15:22:46 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 69FCC8FC16;
	Thu, 11 Aug 2011 15:22:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7BFMkXe098165;
	Thu, 11 Aug 2011 15:22:46 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7BFMkoV098163;
	Thu, 11 Aug 2011 15:22:46 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201108111522.p7BFMkoV098163@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Thu, 11 Aug 2011 15:22:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224783 - stable/7/usr.sbin/kbdmap
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Aug 2011 15:22:46 -0000

Author: jh
Date: Thu Aug 11 15:22:46 2011
New Revision: 224783
URL: http://svn.freebsd.org/changeset/base/224783

Log:
  MFC r216047 by kevlo:
  
  Fix fd leak in get_font
  
  MFC r222568:
  
  Don't try to close the stream if fopen(3) fails.
  
  PR:		bin/155349

Modified:
  stable/7/usr.sbin/kbdmap/kbdmap.c
Directory Properties:
  stable/7/usr.sbin/kbdmap/   (props changed)

Modified: stable/7/usr.sbin/kbdmap/kbdmap.c
==============================================================================
--- stable/7/usr.sbin/kbdmap/kbdmap.c	Thu Aug 11 14:17:04 2011	(r224782)
+++ stable/7/usr.sbin/kbdmap/kbdmap.c	Thu Aug 11 15:22:46 2011	(r224783)
@@ -226,6 +226,7 @@ get_font(void)
 				}
 			}
 		}
+		fclose(fp);
 	} else
 		fprintf(stderr, "Could not open %s for reading\n", sysconfig);