From: Marek Behún <marek.behun@nic.cz>
Date: Sun, 17 Oct 2021 15:36:33 +0000 (+0200)
Subject: env: Don't match empty variable name in env_match()
X-Git-Tag: v2025.01-rc5-pxa1908~1671^2~5
X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/%7B%7B%20%24style.Permalink%20%7D%7D?a=commitdiff_plain;h=6ba4473fb757e7606a4224d87774294c9d60d2cd;p=u-boot.git

env: Don't match empty variable name in env_match()

Do we really allow zero-length variable name? I guess not.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 5b1d4c2448..8d53579d92 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -708,7 +708,7 @@ char *from_env(const char *envvar)
 
 static const char *env_match(const char *p, const char *s1)
 {
-	if (s1 == NULL)
+	if (s1 == NULL || *s1 == '\0')
 		return NULL;
 
 	while (*s1 == *p++)