Skip to content

Fix --premium-license CLI parsing problem with space in path #8683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wjakobsson wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −1
Open

Fix --premium-license CLI parsing problem with space in path #8683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cli/cmdlineparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,10 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
if (!parseNumberArg(argv[i], 31, tmp, true))
return Result::Fail;
}
mSettings.premiumArgs += "--" + p;
if (p.find(' ') != std::string::npos)
mSettings.premiumArgs += "\"--" + p + "\"";
else
mSettings.premiumArgs += "--" + p;
if (isCodingStandard) {
// All checkers related to the coding standard should be enabled. The coding standards
// do not all undefined behavior or portability issues.
Expand Down
9 changes: 9 additions & 0 deletions test/testcmdlineparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ class TestCmdlineParser : public TestFixture {
TEST_CASE(premiumOptionsMetrics);
TEST_CASE(premiumOptionsCertCIntPrecision);
TEST_CASE(premiumOptionsLicenseFile);
TEST_CASE(premiumOptionsLicenseFilePathWithSpace);
TEST_CASE(premiumOptionsInvalid1);
TEST_CASE(premiumOptionsInvalid2);
TEST_CASE(premiumSafety);
Expand Down Expand Up @@ -1642,6 +1643,14 @@ class TestCmdlineParser : public TestFixture {
ASSERT_EQUALS("--license-file=file.lic", settings->premiumArgs);
}

void premiumOptionsLicenseFilePathWithSpace() {
REDIRECT;
asPremium();
const char * const argv[] = {"cppcheck", "--premium-license-file=license folder/file.lic", "file.c"};
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
ASSERT_EQUALS("\"--license-file=license folder/file.lic\"", settings->premiumArgs);
}

void premiumOptionsInvalid1() {
REDIRECT;
asPremium();
Expand Down
Loading