Fix crash when parsing command line with -noincludeconf=0

MarcoFalke · MarcoFalke · commit fa9f711c3746 · 2021-05-21T10:53:09.000+02:00
diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -369,7 +369,7 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
     bool success = true;
     if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {
         for (const auto& include : util::SettingsSpan(*includes)) {
-            error += "-includeconf cannot be used from commandline; -includeconf=" + include.get_str() + "\n";
+            error += "-includeconf cannot be used from commandline; -includeconf=" + include.write() + "\n";
             success = false;
         }
     }
diff --git a/test/functional/feature_includeconf.py b/test/functional/feature_includeconf.py
@@ -42,7 +42,14 @@ def run_test(self):
 
         self.log.info("-includeconf cannot be used as command-line arg")
         self.stop_node(0)
-        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")
+        self.nodes[0].assert_start_raises_init_error(
+            extra_args=['-noincludeconf=0'],
+            expected_msg='Error: Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf=true',
+        )
+        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"',
+        )
 
         self.log.info("-includeconf cannot be used recursively. subversion should end with 'main; relative)/'")
         with open(os.path.join(self.options.tmpdir, "node0", "relative.conf"), "a", encoding="utf8") as f:

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin`
`369`	`369`	`bool success = true;`
`370`	`370`	`if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {`
`371`	`371`	`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";`
`373`	`373`	`success = false;`
`374`	`374`	`}`
`375`	`375`	`}`