aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/nvedit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 8d53579d92..063cc76282 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -708,9 +708,6 @@ char *from_env(const char *envvar)
static const char *env_match(const char *p, const char *s1)
{
- if (s1 == NULL || *s1 == '\0')
- return NULL;
-
while (*s1 == *p++)
if (*s1++ == '=')
return p;
@@ -728,6 +725,9 @@ int env_get_f(const char *name, char *buf, unsigned len)
{
const char *env, *p, *end;
+ if (name == NULL || *name == '\0')
+ return -1;
+
if (gd->env_valid == ENV_INVALID)
env = (const char *)default_environment;
else