d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure kern_envp is never NULL. If we don't get a pointer to

Browse Source 
the environment from the loader, use the static environment.
This commit is contained in:
marcel 2006-11-03 04:06:17 +00:00
parent 6ca4cb8fea
commit c4a6a4c4a7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/ia64/ia64/machdep.c
View File

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