From owner-p4-projects@FreeBSD.ORG  Thu May 13 18:08:08 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8BFEB1065674; Thu, 13 May 2010 18:08:08 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 50A17106566B
	for <perforce@FreeBSD.org>; Thu, 13 May 2010 18:08:08 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E9858FC12
	for <perforce@FreeBSD.org>; Thu, 13 May 2010 18:08:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4DI88Wo048718
	for <perforce@FreeBSD.org>; Thu, 13 May 2010 18:08:08 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4DI88i8048716
	for perforce@freebsd.org; Thu, 13 May 2010 18:08:08 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 13 May 2010 18:08:08 GMT
Message-Id: <201005131808.o4DI88i8048716@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 178215 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 May 2010 18:08:08 -0000

http://p4web.freebsd.org/@@178215?ac=10

Change 178215 by gcooper@starr-bastion on 2010/05/13 18:07:19

	Properly bound the buffer to len with the read for the archive_write*
	call.
	Cordon off the mmap(2) include. 

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#24 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#24 (text+ko) ====

@@ -23,7 +23,10 @@
 
 /* XXX (gcooper): needs to come before sys/stat.h for stat(2). */
 #include <sys/types.h>
+/* Read comment below in add_file. */
+#ifdef BROKEN_MMAP
 #include <sys/mman.h>
+#endif
 #include <sys/stat.h>
 #include <assert.h>
 #include <err.h>
@@ -403,9 +406,9 @@
 					    archive_entry_buf,
 					    sizeof(archive_entry_buf));
 
-					if (archive_write_data(archive,
-					    archive_entry_buf,
-					    sizeof(archive_entry_buf)) !=
+					if (len > 0 &&
+					    archive_write_data(archive,
+					    archive_entry_buf, len) !=
 					    ARCHIVE_OK)
 						error = archive_error_string(archive);