[PATCH v1 1/2] envblk: ignore empty new lines while parsing env files

From: Shreenidhi Shedi <yesshedi@gmail.com>
To: grub-devel@gnu.org
Cc: yesshedi@gmail.com, alexey.makhalov@broadcom.com,
	daniel.kiper@oracle.com,
	Shreenidhi Shedi <shreenidhi.shedi@broadcom.com>
Subject: [PATCH v1 1/2] envblk: ignore empty new lines while parsing env files
Date: Sun, 18 May 2025 13:21:20 +0530	[thread overview]
Message-ID: <20250518075121.76584-2-yesshedi@gmail.com> (raw)
In-Reply-To: <20250518075121.76584-1-yesshedi@gmail.com>

From: Shreenidhi Shedi <shreenidhi.shedi@broadcom.com>

Environment files may contain empty lines, which should be
ignored during parsing. Currently, these lines are not skipped and
resulting in incorrect behavior. This patch adds a check to skip empty
lines along with those starting with `#'.

Signed-off-by: Shreenidhi Shedi <shreenidhi.shedi@broadcom.com>
Reviewed-by: Alexey Makhalov  <alexey.makhalov@broadcom.com>
---
 grub-core/lib/envblk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub-core/lib/envblk.c b/grub-core/lib/envblk.c
index 2e4e78b13..f08dabaad 100644
--- a/grub-core/lib/envblk.c
+++ b/grub-core/lib/envblk.c
@@ -235,7 +235,7 @@ grub_envblk_iterate (grub_envblk_t envblk,

   while (p < pend)
     {
-      if (*p != '#')
+      if (*p != '#' && *p != '\n')
         {
           char *name;
           char *value;
--
2.49.0


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
