redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

kconfig: detect recursive inclusion earlier 

Currently, the recursive inclusion is not detected when the offending
file is about to be included; it is detected the offending file is
about to include the *next* file.  This is because the detection loop
does not involve the file being included.

Do this check against the file that is about to be included so that
the recursive inclusion is detected before unneeded parsing happens.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
hifive-unleashed-5.1
Masahiro Yamada 2018-03-23 02:00:13 +09:00
parent 32a94b8b0c
commit 379a8eb8eb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/kconfig/zconf.l
View File

@ -325,23 +325,25 @@ void zconf_nextfile(const char *name)
buf->parent = current_buf;
current_buf = buf;
for (iter = current_file->parent; iter; iter = iter->parent ) {
if (!strcmp(current_file->name,iter->name) ) {
file->parent = current_file;
for (iter = current_file; iter; iter = iter->parent) {
if (!strcmp(iter->name, file->name)) {
fprintf(stderr,
"Recursive inclusion detected.\n"
"Inclusion path:\n"
" current file : %s\n", zconf_curname());
iter = current_file;
" current file : %s\n", file->name);
iter = file;
do {
iter = iter->parent;
fprintf(stderr, " included from: %s:%d\n",
iter->name, iter->lineno - 1);
} while (strcmp(iter->name, current_file->name));
} while (strcmp(iter->name, file->name));
exit(1);
}
}
file->lineno = 1;
file->parent = current_file;
current_file = file;
}