Skip to content

Commit fa9f711

Browse files
author
MarcoFalke
committed
Fix crash when parsing command line with -noincludeconf=0
1 parent eb4df9a commit fa9f711

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/util/system.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
369369
bool success = true;
370370
if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {
371371
for (const auto& include : util::SettingsSpan(*includes)) {
372-
error += "-includeconf cannot be used from commandline; -includeconf=" + include.get_str() + "\n";
372+
error += "-includeconf cannot be used from commandline; -includeconf=" + include.write() + "\n";
373373
success = false;
374374
}
375375
}

test/functional/feature_includeconf.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,14 @@ def run_test(self):
4242

4343
self.log.info("-includeconf cannot be used as command-line arg")
4444
self.stop_node(0)
45-
self.nodes[0].assert_start_raises_init_error(extra_args=["-includeconf=relative2.conf"], expected_msg="Error: Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf=relative2.conf")
45+
self.nodes[0].assert_start_raises_init_error(
46+
extra_args=['-noincludeconf=0'],
47+
expected_msg='Error: Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf=true',
48+
)
49+
self.nodes[0].assert_start_raises_init_error(
50+
extra_args=['-includeconf=relative2.conf'],
51+
expected_msg='Error: Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf="relative2.conf"',
52+
)
4653

4754
self.log.info("-includeconf cannot be used recursively. subversion should end with 'main; relative)/'")
4855
with open(os.path.join(self.options.tmpdir, "node0", "relative.conf"), "a", encoding="utf8") as f:

0 commit comments

Comments
 (0)