From 86a36cda52b67902c54555e5fbbdfc481fdcb419 Mon Sep 17 00:00:00 2001
From: William Jakobsson <50847546+wjakobsson@users.noreply.github.com>
Date: Tue, 30 Jun 2026 14:35:03 +0200
Subject: [PATCH] Fix --premium-license CLI parsing

---
 cli/cmdlineparser.cpp      | 5 ++++-
 test/testcmdlineparser.cpp | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 1ad0863d96d..f2d2254f833 100644
--- a/cli/cmdlineparser.cpp
+++ b/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.
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
index 3b88e050f82..326b7ad613d 100644
--- a/test/testcmdlineparser.cpp
+++ b/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();