diff mbox series

[v3,09/13] env: Early return from env_get_f() on NULL name

Message ID 20211017153638.29870-10-kabel@kernel.org
State Accepted
Commit 6b6e3eeba9f96b5d908a9b46b7bb25e76109a0c7
Delegated to: Simon Glass
Headers show
Series env_get_char() removal and env_get_f() refactor | expand

Commit Message

Marek Behún Oct. 17, 2021, 3:36 p.m. UTC 
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>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
 cmd/nvedit.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Simon Glass Oct. 21, 2021, 6:49 p.m. UTC | #1 
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>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
 cmd/nvedit.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Applied to u-boot-dm, thanks!
diff mbox series

Patch

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