Fix changes made in r249408.
In some cases, kern_envp is set by the architecture code and env_pos does not contain the length of the static kernel environment. In these cases r249408 causes the kernel to discard the environment. Fix this by updating the check for empty static env to *kern_envp != '\0' Reported by: np@
This commit is contained in:
parent
26d66b9d58
commit
f46206c270
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=249436
@ -231,7 +231,7 @@ init_dynamic_kenv(void *data __unused)
|
||||
kenvp = malloc((KENV_SIZE + 1) * sizeof(char *), M_KENV,
|
||||
M_WAITOK | M_ZERO);
|
||||
i = 0;
|
||||
if (env_pos > 0) {
|
||||
if (*kern_envp != '\0') {
|
||||
for (cp = kern_envp; cp != NULL; cp = kernenv_next(cp)) {
|
||||
len = strlen(cp) + 1;
|
||||
if (len > KENV_MNAMELEN + 1 + KENV_MVALLEN + 1) {
|
||||
|
Loading…
Reference in New Issue
Block a user