From: Marek Behún marek.behun@nic.cz
Test non-NULL name immediately, not in env_match().
Signed-off-by: Marek Behún marek.behun@nic.cz --- cmd/nvedit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 4664b7b872..412918a000 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -708,9 +708,6 @@ char *from_env(const char *envvar)
static int env_match(const char *env, const char *s1, int i2) { - if (s1 == NULL || *s1 == '\0') - return -1; - while (*s1 != '\0' && *s1 == env[i2++]) if (*s1++ == '=') return i2; @@ -729,6 +726,9 @@ int env_get_f(const char *name, char *buf, unsigned len) const char *env; int i, nxt;
+ if (name == NULL || *name == '\0') + return -1; + if (gd->env_valid == ENV_INVALID) env = (const char *)default_environment; else