aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

config: limit depth on includes.

Browse Source 
Don't spend too much effort on it, but this is better than running out
of memory and crashing.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-11-23 12:16:58 +10:30
parent badeaf1a67
commit f5831e5d10
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/configdir.c
View File

@@ -84,7 +84,8 @@ static void config_log_stderr_exit(const char *fmt, ...)
errx(1, "%s", msg); errx(1, "%s", msg);
} }
static void parse_include(const char *filename, bool must_exist, bool early) static void parse_include(const char *filename, bool must_exist, bool early,
size_t depth)
{ {
char *contents, **lines; char *contents, **lines;
char **all_args; /*For each line: either `--`argument, include file, or NULL*/ char **all_args; /*For each line: either `--`argument, include file, or NULL*/
@@ -136,7 +137,11 @@ static void parse_include(const char *filename, bool must_exist, bool early)
continue; continue;
if (!strstarts(all_args[i], "--")) { if (!strstarts(all_args[i], "--")) {
parse_include(all_args[i], true, early); /* There could be more, but this gives a hint. */
if (depth > 100)
errx(1, "Include loop with %s and %s",
filename, all_args[i]);
parse_include(all_args[i], true, early, ++depth);
continue; continue;
} }
@@ -260,7 +265,7 @@ static void parse_implied_config_file(const char *config_basedir,
dir = path_join(NULL, take(dir), network); dir = path_join(NULL, take(dir), network);
filename = path_join(NULL, take(dir), "config"); filename = path_join(NULL, take(dir), "config");
parse_include(filename, false, early); parse_include(filename, false, early, 0);
tal_free(filename); tal_free(filename);
} }
@@ -273,7 +278,7 @@ void parse_config_files(const char *config_filename,
{ {
if (config_filename) { if (config_filename) {
parse_state = FORCED_CONFIG; parse_state = FORCED_CONFIG;
parse_include(config_filename, true, early); parse_include(config_filename, true, early, 0);
parse_state = CMDLINE; parse_state = CMDLINE;
return; return;
} }
@@ -387,7 +392,7 @@ void initial_config_opts(const tal_t *ctx,
/* Read config file first, since cmdline must override */ /* Read config file first, since cmdline must override */
if (*config_filename) if (*config_filename)
parse_include(*config_filename, true, true); parse_include(*config_filename, true, true, 0);
else else
parse_implied_config_file(*config_basedir, NULL, true); parse_implied_config_file(*config_basedir, NULL, true);
opt_early_parse_incomplete(argc, argv, opt_log_stderr_exit); opt_early_parse_incomplete(argc, argv, opt_log_stderr_exit);