From owner-svn-src-head@freebsd.org  Thu Dec 28 05:34:23 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5861CEA7C45;
 Thu, 28 Dec 2017 05:34:23 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DA7B26BC6B;
 Thu, 28 Dec 2017 05:34:20 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBS5YJ9b024742;
 Thu, 28 Dec 2017 05:34:19 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBS5YJ8F024741;
 Thu, 28 Dec 2017 05:34:19 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201712280534.vBS5YJ8F024741@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 28 Dec 2017 05:34:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r327275 - head/sbin/newfs_msdos
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/sbin/newfs_msdos
X-SVN-Commit-Revision: 327275
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Dec 2017 05:34:23 -0000

Author: imp
Date: Thu Dec 28 05:34:19 2017
New Revision: 327275
URL: https://svnweb.freebsd.org/changeset/base/327275

Log:
  Close fd and fd1 before returning now that we're done with them.
  
  CID: 978234, 978236

Modified:
  head/sbin/newfs_msdos/mkfs_msdos.c

Modified: head/sbin/newfs_msdos/mkfs_msdos.c
==============================================================================
--- head/sbin/newfs_msdos/mkfs_msdos.c	Thu Dec 28 05:34:14 2017	(r327274)
+++ head/sbin/newfs_msdos/mkfs_msdos.c	Thu Dec 28 05:34:19 2017	(r327275)
@@ -247,6 +247,7 @@ mkfs_msdos(const char *fname, const char *dtype, const
 
     img = NULL;
     rv = -1;
+    fd = fd1 = -1;
 
     if (o.block_size && o.sectors_per_cluster) {
 	warnx("Cannot specify both block size and sectors per cluster");
@@ -716,6 +717,8 @@ mkfs_msdos(const char *fname, const char *dtype, const
     rv = 0;
 done:
     free(img);
+    close(fd);
+    close(fd1);
 
     return rv;
 }