emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a segfault when profile.env does not exist.

Browse Source
This commit is contained in:
Roy Marples 2008-10-03 17:50:10 +00:00
parent 84f6bf4bff
commit 09a1a5ecd4
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/rc/rc-misc.c
View File

@ -128,13 +128,13 @@ void env_filter(void)
size_t i = 0; size_t i = 0;
/* Add the user defined list of vars */ /* Add the user defined list of vars */
env_allow = rc_stringlist_split(rc_conf_value ("rc_env_allow"), " "); env_allow = rc_stringlist_split(rc_conf_value("rc_env_allow"), " ");
if (exists(PROFILE_ENV)) if (exists(PROFILE_ENV))
profile = rc_config_load(PROFILE_ENV); profile = rc_config_load(PROFILE_ENV);
/* Copy the env and work from this so we can manipulate it safely */ /* Copy the env and work from this so we can manipulate it safely */
env_list = rc_stringlist_new(); env_list = rc_stringlist_new();
while (environ[i]) { while (environ && environ[i]) {
env = rc_stringlist_add(env_list, environ[i++]); env = rc_stringlist_add(env_list, environ[i++]);
e = strchr(env->value, '='); e = strchr(env->value, '=');
if (e) if (e)
@ -159,14 +159,15 @@ void env_filter(void)
} }
/* Now add anything missing from the profile */ /* Now add anything missing from the profile */
TAILQ_FOREACH(env, profile, entries) { if (profile) {
e = strchr(env->value, '='); TAILQ_FOREACH(env, profile, entries) {
*e = '\0'; e = strchr(env->value, '=');
if (!getenv(env->value)) *e = '\0';
setenv(env->value, e + 1, 1); if (!getenv(env->value))
setenv(env->value, e + 1, 1);
}
} }
rc_stringlist_free(env_list); rc_stringlist_free(env_list);
rc_stringlist_free(env_allow); rc_stringlist_free(env_allow);
rc_stringlist_free(profile); rc_stringlist_free(profile);