util: Properly handle -noincludeconf on command line

MarcoFalke · ryanofsky · MarcoFalke · commit fa910b47656d · 2021-06-04T11:08:00.000+02:00
This bug was introduced in commit fad0867. Unit test Co-Authored-By: Russell Yanofsky <russ@yanofsky.org>
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
@@ -329,6 +329,25 @@ BOOST_FIXTURE_TEST_CASE(util_CheckValue, CheckValueTest)
     CheckValue(M::ALLOW_ANY, "-value=abc", Expect{"abc"}.String("abc").Int(0).Bool(false).List({"abc"}));
 }
 
+struct NoIncludeConfTest {
+    std::string Parse(const char* arg)
+    {
+        TestArgsManager test;
+        test.SetupArgs({{"-includeconf", ArgsManager::ALLOW_ANY}});
+        std::array argv{"ignored", arg};
+        std::string error;
+        (void)test.ParseParameters(argv.size(), argv.data(), error);
+        return error;
+    }
+};
+
+BOOST_FIXTURE_TEST_CASE(util_NoIncludeConf, NoIncludeConfTest)
+{
+    BOOST_CHECK_EQUAL(Parse("-noincludeconf"), "");
+    BOOST_CHECK_EQUAL(Parse("-includeconf"), "-includeconf cannot be used from commandline; -includeconf=\"\"");
+    BOOST_CHECK_EQUAL(Parse("-includeconf=file"), "-includeconf cannot be used from commandline; -includeconf=\"file\"");
+}
+
 BOOST_AUTO_TEST_CASE(util_ParseParameters)
 {
     TestArgsManager testArgs;
diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -365,11 +365,14 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
         m_settings.command_line_options[key].push_back(value);
     }
 
-    // we do not allow -includeconf from command line
+    // we do not allow -includeconf from command line, only -noincludeconf
     if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {
-        const auto& include{*util::SettingsSpan(*includes).begin()}; // pick first value as example
-        error = "-includeconf cannot be used from commandline; -includeconf=" + include.write();
-        return false;
+        const util::SettingsSpan values{*includes};
+        // Range may be empty if -noincludeconf was passed
+        if (!values.empty()) {
+            error = "-includeconf cannot be used from commandline; -includeconf=" + values.begin()->write();
+            return false; // pick first value as example
+        }
     }
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -365,11 +365,14 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin`
`365`	`365`	`m_settings.command_line_options[key].push_back(value);`
`366`	`366`	`}`
`367`	`367`
`368`		`- // we do not allow -includeconf from command line`
	`368`	`+ // we do not allow -includeconf from command line, only -noincludeconf`
`369`	`369`	`if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {`
`370`		`- const auto& include{util::SettingsSpan(includes).begin()}; // pick first value as example`
`371`		`- error = "-includeconf cannot be used from commandline; -includeconf=" + include.write();`
`372`		`- return false;`
	`370`	`+ const util::SettingsSpan values{*includes};`
	`371`	`+ // Range may be empty if -noincludeconf was passed`
	`372`	`+ if (!values.empty()) {`
	`373`	`+ error = "-includeconf cannot be used from commandline; -includeconf=" + values.begin()->write();`
	`374`	`+ return false; // pick first value as example`
	`375`	`+ }`
`373`	`376`	`}`
`374`	`377`	`return true;`
`375`	`378`	`}`