From owner-p4-projects@FreeBSD.ORG  Tue Jun 15 01:20:25 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F29121065677; Tue, 15 Jun 2010 01:20:24 +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 B61DE106566B
	for <perforce@FreeBSD.org>; Tue, 15 Jun 2010 01:20:24 +0000 (UTC)
	(envelope-from jlaffaye@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A3D8F8FC13
	for <perforce@FreeBSD.org>; Tue, 15 Jun 2010 01:20:24 +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 o5F1KOqa021283
	for <perforce@FreeBSD.org>; Tue, 15 Jun 2010 01:20:24 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5F1KOhB021281
	for perforce@freebsd.org; Tue, 15 Jun 2010 01:20:24 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Date: Tue, 15 Jun 2010 01:20:24 GMT
Message-Id: <201006150120.o5F1KOhB021281@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jlaffaye@FreeBSD.org using -f
From: Julien Laffaye <jlaffaye@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 179632 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: Tue, 15 Jun 2010 01:20:25 -0000

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

Change 179632 by jlaffaye@jlaffaye-chulak on 2010/06/15 01:20:08

	NULL terminate the buffer returned by unpack_to_buffer().
	This fix a bug in read_plist_from_buffer() caused by strlcpy() 
	which try to read outside of the buffer range (spotted by valgrind).

Affected files ...

.. //depot/projects/soc2010/pkg_complete/lib/libpkg/file.c#6 edit

Differences ...

==== //depot/projects/soc2010/pkg_complete/lib/libpkg/file.c#6 (text+ko) ====

@@ -401,7 +401,7 @@
 					errno = EINVAL;
 				else {
 
-					*buf = malloc(sizeof(char)*buf_size);
+					*buf = malloc(buf_size+1);
 
 					if (*buf == NULL) {
 						error = strerror(errno);
@@ -411,6 +411,8 @@
 						r = archive_read_data(archive,
 						    *buf, buf_size);
 
+						(*buf)[buf_size] = 0;
+
 						if (r != buf_size) {
 							error = archive_error_string(archive);
 							buf_size = 0;