From owner-svn-src-all@freebsd.org  Tue Feb  4 21:18:17 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2C9EF234F98;
 Tue,  4 Feb 2020 21:18:17 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48ByGd08YHz4b9r;
 Tue,  4 Feb 2020 21:18:17 +0000 (UTC)
 (envelope-from markj@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0082D20006;
 Tue,  4 Feb 2020 21:18:17 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 014LIGCg019295;
 Tue, 4 Feb 2020 21:18:16 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 014LIGeb019294;
 Tue, 4 Feb 2020 21:18:16 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <202002042118.014LIGeb019294@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 4 Feb 2020 21:18:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r357540 - head/contrib/elftoolchain/readelf
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/contrib/elftoolchain/readelf
X-SVN-Commit-Revision: 357540
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Feb 2020 21:18:17 -0000

Author: markj
Date: Tue Feb  4 21:18:16 2020
New Revision: 357540
URL: https://svnweb.freebsd.org/changeset/base/357540

Log:
  readelf: Fix a double close of the input file.
  
  The caller of dump_object() is responsible for opening the file, let it
  be responsible for closing too.
  
  CID:		1411588
  MFC after:	1 week
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/contrib/elftoolchain/readelf/readelf.c

Modified: head/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- head/contrib/elftoolchain/readelf/readelf.c	Tue Feb  4 21:17:59 2020	(r357539)
+++ head/contrib/elftoolchain/readelf/readelf.c	Tue Feb  4 21:18:16 2020	(r357540)
@@ -7247,7 +7247,6 @@ dump_object(struct readelf *re, int fd)
 
 done:
 	elf_end(re->elf);
-	close(fd);
 }
 
 static void