From owner-p4-projects@FreeBSD.ORG  Thu Nov 13 00:11:45 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8B673106567E; Thu, 13 Nov 2008 00:11:45 +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 4F82A106567A
	for <perforce@freebsd.org>; Thu, 13 Nov 2008 00:11:45 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B8738FC14
	for <perforce@freebsd.org>; Thu, 13 Nov 2008 00:11:45 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAD0BjC4094949
	for <perforce@freebsd.org>; Thu, 13 Nov 2008 00:11:45 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAD0BjmG094947
	for perforce@freebsd.org; Thu, 13 Nov 2008 00:11:45 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Thu, 13 Nov 2008 00:11:45 GMT
Message-Id: <200811130011.mAD0BjmG094947@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 152913 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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 Nov 2008 00:11:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=152913

Change 152913 by peter@peter_cheese on 2008/11/13 00:10:51

	Create and initialize an extra slot in the new env[] array for the
	32 bit preload string.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_initimg/initimg-freebsd.c#6 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_initimg/initimg-freebsd.c#6 (text+ko) ====

@@ -272,13 +272,14 @@
 
    /* Allocate a new space */
    ret = VG_(malloc) ("initimg-linux.sce.3",
-                      sizeof(HChar *) * (envc+1+1)); /* 1 new entry + NULL */
+                      sizeof(HChar *) * (envc+2+1)); /* 2 new entries + NULL */
    vg_assert(ret);
 
    /* copy it over */
    for (cpp = ret; *origenv; )
       *cpp++ = *origenv++;
    *cpp = NULL;
+   *(cpp + 1) = NULL;
    
    vg_assert(envc == (cpp - ret));