summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2024-02-02 18:57:59 +0300
committerSasha Levin <sashal@kernel.org>2024-03-27 01:22:42 +0300
commitd0687545f89d410b42ed84a8cb089bd670e0a5cf (patch)
tree4335900ba0629e6b62643f3dc9e38c9a5b0187a6 /scripts
parent6e839e4153c9881d79f94263fa352db35aa82b20 (diff)
downloadlinux-d0687545f89d410b42ed84a8cb089bd670e0a5cf.tar.xz
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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/zconf.l7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index c2f577d71964..2a47ce9b219a 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -292,8 +292,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;