diff options
| author | Marek Behún <marek.behun@nic.cz> | 2021-10-17 17:36:34 +0200 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-10-21 12:50:48 -0600 |
| commit | 6b6e3eeba9f96b5d908a9b46b7bb25e76109a0c7 (patch) | |
| tree | c4a188ba145a74ceadb21148557972db113eae89 /cmd/nvedit.c | |
| parent | 6ba4473fb757e7606a4224d87774294c9d60d2cd (diff) | |
env: Early return from env_get_f() on NULL name
Test non-NULL name immediately, not in env_match().
Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'cmd/nvedit.c')
| -rw-r--r-- | cmd/nvedit.c | 6 |
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 |