Merge branch 'cppcheck-opensource:main' into main

Author: IOBYTE

cli/cmdlineparser.cpp

@@ -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.

lib/tokenize.cpp

@@ -2720,6 +2720,9 @@ namespace {
             return false;
         }
 
+        if (!tok->tokAt(-1))
+            return false;
+
         // skip other using with this name
         if (tok1->strAt(-1) == "using") {
             // fixme: this is wrong

test/testcmdlineparser.cpp

@@ -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);
@@ -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();

test/testsimplifyusing.cpp

@@ -77,6 +77,7 @@ class TestSimplifyUsing : public TestFixture {
         TEST_CASE(simplifyUsing37);
         TEST_CASE(simplifyUsing38);
         TEST_CASE(simplifyUsing39);
+        TEST_CASE(simplifyUsing40);
 
         TEST_CASE(simplifyUsing8970);
         TEST_CASE(simplifyUsing8971);
@@ -940,6 +941,13 @@ class TestSimplifyUsing : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void simplifyUsing40() {
+        const char code[] = "uint8_t f();\n" // #14876
+                            "using ::std::uint8_t;";
+        const char expected[] = "uint8_t f ( ) ;";
+        ASSERT_EQUALS(expected, tok(code));
+    }
+
     void simplifyUsing8970() {
         const char code[] = "using V = std::vector<int>;\n"
                             "struct A {\n"