From owner-svn-src-stable@FreeBSD.ORG  Tue Apr 22 21:25:04 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1925D123;
 Tue, 22 Apr 2014 21:25:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 056FE1E53;
 Tue, 22 Apr 2014 21:25:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3MLP3wE041244;
 Tue, 22 Apr 2014 21:25:03 GMT
 (envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3MLP30i041243;
 Tue, 22 Apr 2014 21:25:03 GMT
 (envelope-from brueffer@svn.freebsd.org)
Message-Id: <201404222125.s3MLP30i041243@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Tue, 22 Apr 2014 21:25:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r264785 - stable/10/usr.bin/ldd
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2014 21:25:04 -0000

Author: brueffer
Date: Tue Apr 22 21:25:03 2014
New Revision: 264785
URL: http://svnweb.freebsd.org/changeset/base/264785

Log:
  MFC: r264419
  
  Avoid double close() of a file descriptor.
  
  CID:		1006089
  Found with:	Coverity Prevent(tm)

Modified:
  stable/10/usr.bin/ldd/sods.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/ldd/sods.c
==============================================================================
--- stable/10/usr.bin/ldd/sods.c	Tue Apr 22 21:17:12 2014	(r264784)
+++ stable/10/usr.bin/ldd/sods.c	Tue Apr 22 21:25:03 2014	(r264785)
@@ -204,7 +204,6 @@ dump_file(const char *fname)
 	warnx("%s: this is an ELF program; use objdump to examine", fname);
 	++error_count;
 	munmap(objbase, sb.st_size);
-	close(fd);
 	return;
     }