colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

env: Early return from env_get_f() on NULL name

Browse Source 
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>
This commit is contained in:
Marek Behún
2021-10-17 17:36:34 +02:00
committed by Simon Glass
parent 6ba4473fb7
commit 6b6e3eeba9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/nvedit.c
View File

@@ -708,9 +708,6 @@ char *from_env(const char *envvar)
static const char *env_match(const char *p, const char *s1) static const char *env_match(const char *p, const char *s1)
{ {
if (s1 == NULL || *s1 == '\0')
return NULL;
while (*s1 == *p++) while (*s1 == *p++)
if (*s1++ == '=') if (*s1++ == '=')
return p; return p;
@@ -728,6 +725,9 @@ int env_get_f(const char *name, char *buf, unsigned len)
{ {
const char *env, *p, *end; const char *env, *p, *end;
if (name == NULL || *name == '\0')
return -1;
if (gd->env_valid == ENV_INVALID) if (gd->env_valid == ENV_INVALID)
env = (const char *)default_environment; env = (const char *)default_environment;
else else