From owner-svn-src-projects@FreeBSD.ORG  Tue Jan  8 20:49:44 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D606C5B3;
 Tue,  8 Jan 2013 20:49:44 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C8B67A57;
 Tue,  8 Jan 2013 20:49:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r08Kni8p099221;
 Tue, 8 Jan 2013 20:49:44 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r08Knira099220;
 Tue, 8 Jan 2013 20:49:44 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301082049.r08Knira099220@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 8 Jan 2013 20:49:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245176 - projects/mtree/usr.bin/xinstall
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jan 2013 20:49:44 -0000

Author: brooks
Date: Tue Jan  8 20:49:43 2013
New Revision: 245176
URL: http://svnweb.freebsd.org/changeset/base/245176

Log:
  When we are creating an empty file by installing /dev/null, set the
  digestresult to NULL so it can be passed to free later.

Modified:
  projects/mtree/usr.bin/xinstall/xinstall.c

Modified: projects/mtree/usr.bin/xinstall/xinstall.c
==============================================================================
--- projects/mtree/usr.bin/xinstall/xinstall.c	Tue Jan  8 19:38:57 2013	(r245175)
+++ projects/mtree/usr.bin/xinstall/xinstall.c	Tue Jan  8 20:49:43 2013	(r245176)
@@ -794,6 +794,8 @@ install(const char *from_name, const cha
 		if (!devnull)
 			digestresult = copy(from_fd, from_name, to_fd,
 			     tempcopy ? tempfile : to_name, from_sb.st_size);
+		else
+			digestresult = NULL;
 	}
 
 	if (dostrip) {