From owner-p4-projects@FreeBSD.ORG  Wed Nov  1 00:00:43 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A4D9516A4C9; Wed,  1 Nov 2006 00:00:42 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7E15B16A47B
	for <perforce@freebsd.org>; Wed,  1 Nov 2006 00:00:42 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 473D843D67
	for <perforce@freebsd.org>; Tue, 31 Oct 2006 23:59:23 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9VNxNLI044229
	for <perforce@freebsd.org>; Tue, 31 Oct 2006 23:59:23 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9VNxNIF044226
	for perforce@freebsd.org; Tue, 31 Oct 2006 23:59:23 GMT
	(envelope-from marcel@freebsd.org)
Date: Tue, 31 Oct 2006 23:59:23 GMT
Message-Id: <200610312359.k9VNxNIF044226@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 108875 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: Wed, 01 Nov 2006 00:00:43 -0000

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

Change 108875 by marcel@marcel_cluster on 2006/10/31 23:58:23

	Guarantee that kern_envp is never NULL.

Affected files ...

.. //depot/projects/ia64/sys/ia64/ia64/machdep.c#121 edit

Differences ...

==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#121 (text+ko) ====

@@ -586,10 +586,11 @@
 		preload_metadata = (caddr_t)bootinfo.bi_modulep;
 	else
 		metadata_missing = 1;
-	if (envmode == 1)
+
+	if (envmode == 0 && bootinfo.bi_envp)
+		kern_envp = (caddr_t)bootinfo.bi_envp;
+	else
 		kern_envp = static_env;
-	else
-		kern_envp = (caddr_t)bootinfo.bi_envp;
 
 	/*
 	 * Look at arguments passed to us and compute boothowto.