From owner-svn-src-all@freebsd.org  Tue May 10 20:09:41 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 AACDFB36ED8;
 Tue, 10 May 2016 20:09:41 +0000 (UTC) (envelope-from cem@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 7BC9713AC;
 Tue, 10 May 2016 20:09:41 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4AK9e7o054264;
 Tue, 10 May 2016 20:09:40 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4AK9e82054263;
 Tue, 10 May 2016 20:09:40 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201605102009.u4AK9e82054263@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: "Conrad E. Meyer" <cem@FreeBSD.org>
Date: Tue, 10 May 2016 20:09:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299385 - head/usr.bin/sdiff
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.22
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, 10 May 2016 20:09:41 -0000

Author: cem
Date: Tue May 10 20:09:40 2016
New Revision: 299385
URL: https://svnweb.freebsd.org/changeset/base/299385

Log:
  sdiff(1): Fix potential NULL deref in cleanup path
  
  In the presence of the --diff-pid argument, it is possible for 'diffpipe' to be
  NULL.  Only fclose() it if it was initialized.
  
  Reported by:	Coverity
  CID:		1355183
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/usr.bin/sdiff/sdiff.c

Modified: head/usr.bin/sdiff/sdiff.c
==============================================================================
--- head/usr.bin/sdiff/sdiff.c	Tue May 10 20:02:03 2016	(r299384)
+++ head/usr.bin/sdiff/sdiff.c	Tue May 10 20:09:40 2016	(r299385)
@@ -430,7 +430,8 @@ main(int argc, char **argv)
 		/* Close open files and pipe, delete temps */
 		fclose(file1);
 		fclose(file2);
-		fclose(diffpipe);
+		if (diffpipe != NULL)
+			fclose(diffpipe);
 		if (tmp1)
 			if (unlink(tmp1))
 				warn("Error deleting %s.", tmp1);