summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2024-02-03 00:57:59 +0900
committerSasha Levin <sashal@kernel.org>2024-03-26 18:21:34 -0400
commit04dd61330fe8b56988be9c465082f9877fccb452 (patch)
tree252885af4befd4f90c94f4c5d5dd4964c4623932
parent3019ad4a028214cb4ef4fd8ac76d5f6be497b387 (diff)
downloadlinux-04dd61330fe8b56988be9c465082f9877fccb452.tar.gz
linux-04dd61330fe8b56988be9c465082f9877fccb452.tar.bz2
linux-04dd61330fe8b56988be9c465082f9877fccb452.zip
kconfig: fix infinite loop when expanding a macro at the end of file
[ Upstream commit af8bbce92044dc58e4cc039ab94ee5d470a621f5 ] A macro placed at the end of a file with no newline causes an infinite loop. [Test Kconfig] $(info,hello) \ No newline at end of file I realized that flex-provided input() returns 0 instead of EOF when it reaches the end of a file. Fixes: 104daea149c4 ("kconfig: reference environment variables directly and remove 'option env='") Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--scripts/kconfig/lexer.l7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/kconfig/lexer.l b/scripts/kconfig/lexer.l
index 312cbad2d34d..2a76393d52b5 100644
--- a/scripts/kconfig/lexer.l
+++ b/scripts/kconfig/lexer.l
@@ -301,8 +301,11 @@ static char *expand_token(const char *in, size_t n)
new_string();
append_string(in, n);
- /* get the whole line because we do not know the end of token. */
- while ((c = input()) != EOF) {
+ /*
+ * get the whole line because we do not know the end of token.
+ * input() returns 0 (not EOF!) when it reachs the end of file.
+ */
+ while ((c = input()) != 0) {
if (c == '\n') {
unput(c);
break;