From owner-svn-src-all@freebsd.org  Wed Apr 20 00:19:05 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 DEDF8B15C47;
 Wed, 20 Apr 2016 00:19:05 +0000 (UTC)
 (envelope-from ngie@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 A2615180E;
 Wed, 20 Apr 2016 00:19:05 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3K0J4tW006670;
 Wed, 20 Apr 2016 00:19:04 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3K0J43L006669;
 Wed, 20 Apr 2016 00:19:04 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201604200019.u3K0J43L006669@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 20 Apr 2016 00:19:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298312 - head/lib/libc/tests/stdio
X-SVN-Group: head
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.21
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: Wed, 20 Apr 2016 00:19:06 -0000

Author: ngie
Date: Wed Apr 20 00:19:04 2016
New Revision: 298312
URL: https://svnweb.freebsd.org/changeset/base/298312

Log:
  Fix double fclose of `fp1` when freopen fails
  
  freopen handles closing file descriptors on error, with the exception of
  fdopen'ed descriptors, so closing an already fclose'd file descriptor is
  incorrect
  
  CID: 1338525
  Differential Revision: https://reviews.freebsd.org/D6013
  MFC after: 2 weeks
  Reported by: Coverity
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/tests/stdio/freopen_test.c

Modified: head/lib/libc/tests/stdio/freopen_test.c
==============================================================================
--- head/lib/libc/tests/stdio/freopen_test.c	Tue Apr 19 23:59:10 2016	(r298311)
+++ head/lib/libc/tests/stdio/freopen_test.c	Wed Apr 20 00:19:04 2016	(r298312)
@@ -48,7 +48,6 @@ runtest(const char *fname1, const char *
 	    "fopen(\"%s\", \"%s\") failed; errno=%d", fname1, mode1, errno);
 	fp2 = freopen(fname2, mode2, fp1);
 	if (fp2 == NULL) {
-		fclose(fp1);
 		ATF_REQUIRE_MSG(success == false,
 		    "freopen(\"%s\", \"%s\", fopen(\"%s\", \"%s\")) succeeded "
 		    "unexpectedly", fname2_print, mode2, fname1, mode1);