Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Oct 2006 23:59:23 GMT
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 108875 for review
Message-ID:  <200610312359.k9VNxNIF044226@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610312359.k9VNxNIF044226>