From 1324a808b57b69374b7f3cd02a3ad589d4f2fb01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 22 Dec 2023 19:57:55 +0100
Subject: [PATCH 01/29] CI: fix --version tests (#5790)

---
 test/testcmdlineparser.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
index ba1c624feee..2cb87695e0f 100644
--- a/test/testcmdlineparser.cpp
+++ b/test/testcmdlineparser.cpp
@@ -410,7 +410,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--version"};
         ASSERT_EQUALS(CmdLineParser::Result::Exit, parser->parseFromArgs(2, argv));
-        ASSERT_EQUALS("Cppcheck 2.13 dev\n", logger->str());
+        ASSERT(logger->str().compare(0, 11, "Cppcheck 2.") == 0);
     }
 
     void versionWithCfg() {
@@ -431,7 +431,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--library=missing", "--version"};
         ASSERT_EQUALS(CmdLineParser::Result::Exit, parser->parseFromArgs(3, argv));
-        ASSERT_EQUALS("Cppcheck 2.13 dev\n", logger->str());
+        ASSERT(logger->str().compare(0, 11, "Cppcheck 2.") == 0);
     }
 
     void versionWithInvalidCfg() {

From c23521adda441d587a6e422b04f8dd1a6e44e6b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 22 Dec 2023 21:59:40 +0100
Subject: [PATCH 02/29] set version 2.13.0 (#5788)

---
 cli/main.cpp                  | 2 +-
 cmake/versions.cmake          | 2 +-
 lib/version.h                 | 2 +-
 man/manual.md                 | 2 +-
 man/reference-cfg-format.md   | 2 +-
 man/writing-addons.md         | 2 +-
 win_installer/productInfo.wxi | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cli/main.cpp b/cli/main.cpp
index 7e076dfbcea..23aad4e85ce 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -20,7 +20,7 @@
 /**
  *
  * @mainpage Cppcheck
- * @version 2.12.99
+ * @version 2.13.0
  *
  * @section overview_sec Overview
  * Cppcheck is a simple tool for static analysis of C/C++ code.
diff --git a/cmake/versions.cmake b/cmake/versions.cmake
index cf2020d3fea..dfeb5d144d0 100644
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@@ -1,6 +1,6 @@
 # Version for libraries CPP
 # Version string must have 3 "parts". https://sourceforge.net/p/cppcheck/discussion/development/thread/e57efb2b62/
-SET(VERSION "2.12.99")
+SET(VERSION "2.13.0")
 STRING(REGEX MATCHALL "[0-9]+" VERSION_PARTS "${VERSION}")
 LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
 LIST(GET VERSION_PARTS 1 VERSION_MINOR)
diff --git a/lib/version.h b/lib/version.h
index 85bb170338f..38f9406c0a6 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -5,7 +5,7 @@
 #define versionH
 
 #define CPPCHECK_MAJOR_VERSION 2
-#define CPPCHECK_MINOR_VERSION 12
+#define CPPCHECK_MINOR_VERSION 13
 #define CPPCHECK_DEVMINOR_VERSION 13
 #define CPPCHECK_FIX_VERSION 0
 
diff --git a/man/manual.md b/man/manual.md
index 819760925a7..3767f9a736e 100644
--- a/man/manual.md
+++ b/man/manual.md
@@ -1,6 +1,6 @@
 ---
 title: Cppcheck manual
-subtitle: Version 2.12.99
+subtitle: Version 2.13
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/man/reference-cfg-format.md b/man/reference-cfg-format.md
index 70ff8b95918..a330f003e51 100644
--- a/man/reference-cfg-format.md
+++ b/man/reference-cfg-format.md
@@ -1,6 +1,6 @@
 ---
 title: Cppcheck .cfg format
-subtitle: Version 2.12.99
+subtitle: Version 2.13
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/man/writing-addons.md b/man/writing-addons.md
index 63b5a2ca0d5..3016a4cb5c8 100644
--- a/man/writing-addons.md
+++ b/man/writing-addons.md
@@ -1,6 +1,6 @@
 ---
 title: Writing addons
-subtitle: Version 2.12.99
+subtitle: Version 2.13
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index 1147bf2e514..918f7dc3507 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define ProductName = "Cppcheck $(var.Platform) 2.13 dev" ?>
+  <?define ProductName = "Cppcheck $(var.Platform) 2.13.0" ?>
   <?define ProductNameShort = "Cppcheck" ?>
-  <?define ProductVersion = "2.12.99" ?>
+  <?define ProductVersion = "2.13.0" ?>
 
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>

From fef1ede35adf67f7e70004849ea397c365d8b174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 22 Dec 2023 22:39:09 +0100
Subject: [PATCH 03/29] releasenotes: cleanup, list safety critical issues [ci
 skip] (#5791)

---
 releasenotes.txt | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/releasenotes.txt b/releasenotes.txt
index 593f61498c8..e8c4cedd404 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -5,12 +5,6 @@ New checks:
 - returnImplicitInt for C functions without return type (previously reported as a debug message)
 - iterateByValue for iterating by value in a range-based for loop when a const reference could be used
 
-Improved checking:
--
-
-GUI:
--
-
 Changed interface:
 - Final report of active checkers is reported as a normal information message instead.
 
@@ -44,3 +38,8 @@ Other:
 - Markup files will now be processed after the regular source files when using multiple threads/processes (some issues remain - see Trac #12167 for details).
 - Added file name to ValueFlow "--debug" output.
 - Fixed build when using "clang-cl" in CMake.
+
+Safety critical:
+- #10866 unsafe handling of unconditional #error
+- #12071 unsafe suppressions of critical errors
+- #12079 missing "misra-config" warning, calling unknown function in condition

From c05a3903704f81b4d1ab9dbff7503804d9288929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 22 Dec 2023 23:21:02 +0100
Subject: [PATCH 04/29] dmake: in run-dmake target run dmake with --release in
 a release Makefile (#5792)

---
 tools/dmake.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index 1ca4262c0e5..eee4b458ba3 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -674,7 +674,7 @@ int main(int argc, char **argv)
     fout << "dmake:\ttools/dmake.o cli/filelister.o $(libcppdir)/pathmatch.o $(libcppdir)/path.o $(libcppdir)/utils.o externals/simplecpp/simplecpp.o\n";
     fout << "\t$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)\n\n";
     fout << "run-dmake: dmake\n";
-    fout << "\t./dmake\n\n";
+    fout << "\t./dmake" << (release ? " --release" : "") << "\n\n"; // Make CI in release builds happy
     fout << "clean:\n";
     fout << "\trm -f build/*.cpp build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/*/*.o testrunner dmake cppcheck cppcheck.exe cppcheck.1\n\n";
     fout << "man:\tman/cppcheck.1\n\n";

From da29903ffcbde465b6c2b47e8dc38277743f47ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 22 Dec 2023 23:22:29 +0100
Subject: [PATCH 05/29] Makefile: run 'dmake --release'

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 92608b760a0..a73ade8692a 100644
--- a/Makefile
+++ b/Makefile
@@ -137,7 +137,7 @@ ifeq (clang++, $(findstring clang++,$(CXX)))
     CPPCHK_GLIBCXX_DEBUG=
 endif
 ifndef CXXFLAGS
-    CXXFLAGS=-pedantic -Wall -Wextra -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-shadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar -Woverloaded-virtual $(CPPCHK_GLIBCXX_DEBUG) -g
+    CXXFLAGS=-std=c++0x -O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-multichar
 endif
 
 ifeq (g++, $(findstring g++,$(CXX)))
@@ -365,7 +365,7 @@ dmake:	tools/dmake.o cli/filelister.o $(libcppdir)/pathmatch.o $(libcppdir)/path
 	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
 
 run-dmake: dmake
-	./dmake
+	./dmake --release
 
 clean:
 	rm -f build/*.cpp build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/*/*.o testrunner dmake cppcheck cppcheck.exe cppcheck.1

From 68f5963a68059c93f346457c183b82056b465a05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 12 Jan 2024 11:30:51 +0100
Subject: [PATCH 06/29] Fix #12341 (If --premium=safety is used then go to
 "safety mode". do not override this in cppcheck.cfg) (#5872)

---
 cli/cmdlineparser.cpp      |  2 ++
 lib/settings.cpp           |  2 +-
 test/testcmdlineparser.cpp | 12 ++++++++++++
 test/testsettings.cpp      | 29 +++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 82ef08a4179..a870c571726 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -889,6 +889,8 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
             // Special Cppcheck Premium options
             else if (std::strncmp(argv[i], "--premium=", 10) == 0 && isCppcheckPremium()) {
+                if (std::strcmp(argv[i], "--premium=safety") == 0)
+                    mSettings.safety = true;
                 if (!mSettings.premiumArgs.empty())
                     mSettings.premiumArgs += " ";
                 const std::string p(argv[i] + 10);
diff --git a/lib/settings.cpp b/lib/settings.cpp
index a58e75b2c21..393ce377732 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -125,7 +125,7 @@ std::string Settings::loadCppcheckCfg()
             const auto& v = it->second;
             if (!v.is<bool>())
                 return "'safety' is not a bool";
-            safety = v.get<bool>();
+            safety = safety || v.get<bool>();
         }
     }
 
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
index 2cb87695e0f..22bea9219bc 100644
--- a/test/testcmdlineparser.cpp
+++ b/test/testcmdlineparser.cpp
@@ -212,6 +212,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(maxConfigsMissingCount);
         TEST_CASE(maxConfigsInvalid);
         TEST_CASE(maxConfigsTooSmall);
+        TEST_CASE(premiumSafety);
         TEST_CASE(reportProgress1);
         TEST_CASE(reportProgress2);
         TEST_CASE(reportProgress3);
@@ -1185,6 +1186,17 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' must be greater than 0.\n", logger->str());
     }
 
+    void premiumSafety() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--premium=safety", "file.cpp"};
+        settings->safety = false;
+        settings->cppcheckCfgProductName = "Cppcheck Premium 0.0.0";
+        ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->safety);
+        settings->safety = false;
+        settings->cppcheckCfgProductName.clear();
+    }
+
     void reportProgress1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--report-progress", "file.cpp"};
diff --git a/test/testsettings.cpp b/test/testsettings.cpp
index f09dfed1aa4..6c2b2de2d7c 100644
--- a/test/testsettings.cpp
+++ b/test/testsettings.cpp
@@ -30,6 +30,7 @@ class TestSettings : public TestFixture {
     void run() override {
         TEST_CASE(simpleEnableGroup);
         TEST_CASE(loadCppcheckCfg);
+        TEST_CASE(loadCppcheckCfgSafety);
     }
 
     void simpleEnableGroup() const {
@@ -209,6 +210,34 @@ class TestSettings : public TestFixture {
 
         // TODO: test with FILESDIR
     }
+
+    void loadCppcheckCfgSafety() const
+    {
+        // Test the "safety" flag
+        {
+            Settings s;
+            s.safety = false;
+            ScopedFile file("cppcheck.cfg", "{}");
+            ASSERT_EQUALS("", s.loadCppcheckCfg());
+            ASSERT_EQUALS(false, s.safety);
+        }
+
+        {
+            Settings s;
+            s.safety = true;
+            ScopedFile file("cppcheck.cfg", "{\"safety\": false}");
+            ASSERT_EQUALS("", s.loadCppcheckCfg());
+            ASSERT_EQUALS(true, s.safety);
+        }
+
+        {
+            Settings s;
+            s.safety = false;
+            ScopedFile file("cppcheck.cfg", "{\"safety\": true}");
+            ASSERT_EQUALS("", s.loadCppcheckCfg());
+            ASSERT_EQUALS(true, s.safety);
+        }
+    }
 };
 
 REGISTER_TEST(TestSettings)

From 36299b45306e52de646065bf9a22beb89e4a723b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 12 Jan 2024 17:12:27 +0100
Subject: [PATCH 07/29] Fix #12344 (cmdline: better validation of premium
 options) (#5875)

---
 cli/cmdlineparser.cpp      | 20 ++++++++++++++++++--
 test/testcmdlineparser.cpp | 31 +++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index a870c571726..6b6eac98329 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -889,11 +889,26 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
             // Special Cppcheck Premium options
             else if (std::strncmp(argv[i], "--premium=", 10) == 0 && isCppcheckPremium()) {
+                const std::set<std::string> valid{
+                    "autosar",
+                    "cert-c-2016",
+                    "cert-c++-2016",
+                    "misra-c-2012",
+                    "misra-c-2023",
+                    "misra-c++-2008",
+                    "misra-c++-2023",
+                    "bughunting",
+                    "safety"};
+
                 if (std::strcmp(argv[i], "--premium=safety") == 0)
                     mSettings.safety = true;
                 if (!mSettings.premiumArgs.empty())
                     mSettings.premiumArgs += " ";
                 const std::string p(argv[i] + 10);
+                if (!valid.count(p) && !startsWith(p, "cert-c-int-precision=")) {
+                    mLogger.printError("invalid --premium option '" + p + "'.");
+                    return Result::Fail;
+                }
                 mSettings.premiumArgs += "--" + p;
                 if (p == "misra-c-2012" || p == "misra-c-2023")
                     mSettings.addons.emplace("misra");
@@ -1515,10 +1530,11 @@ void CmdLineParser::printHelp() const
             "                          * cert-c++-2016     Cert C++ 2016 checking\n"
             "                          * misra-c-2012      Misra C 2012\n"
             "                          * misra-c-2023      Misra C 2023\n"
-            "                          * misra-c++-2008    Misra C++ 2008 (partial)\n"
+            "                          * misra-c++-2008    Misra C++ 2008\n"
             "                         Other:\n"
             "                          * bughunting        Soundy analysis\n"
-            "                          * cert-c-int-precision=BITS  Integer precision to use in Cert C analysis.\n";
+            "                          * cert-c-int-precision=BITS  Integer precision to use in Cert C analysis.\n"
+            "                          * safety            Safe mode\n";
     }
 
     oss <<
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
index 22bea9219bc..678732b4f37 100644
--- a/test/testcmdlineparser.cpp
+++ b/test/testcmdlineparser.cpp
@@ -212,6 +212,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(maxConfigsMissingCount);
         TEST_CASE(maxConfigsInvalid);
         TEST_CASE(maxConfigsTooSmall);
+        TEST_CASE(premiumOptions);
         TEST_CASE(premiumSafety);
         TEST_CASE(reportProgress1);
         TEST_CASE(reportProgress2);
@@ -1186,6 +1187,36 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' must be greater than 0.\n", logger->str());
     }
 
+    void premiumOptions() {
+        REDIRECT;
+        settings->cppcheckCfgProductName = "Cppcheck Premium 0.0.0";
+        {
+            const char * const argv[] = {"cppcheck", "--premium=misra-c-2012", "file.c"};
+            ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+        }
+        {
+            const char * const argv[] = {"cppcheck", "--premium=misra-c++-2023", "file.c"};
+            ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+        }
+        {
+            const char * const argv[] = {"cppcheck", "--premium=cert-c++-2016", "file.c"};
+            ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+        }
+        // invalid options
+        {
+            const char * const argv[] = {"cppcheck", "--premium=misra", "file.c"};
+            ASSERT_EQUALS(CmdLineParser::Result::Fail, parser->parseFromArgs(3, argv));
+            ASSERT_EQUALS("cppcheck: error: invalid --premium option 'misra'.\n", logger->str());
+        }
+        {
+            const char * const argv[] = {"cppcheck", "--premium=cert", "file.c"};
+            ASSERT_EQUALS(CmdLineParser::Result::Fail, parser->parseFromArgs(3, argv));
+            ASSERT_EQUALS("cppcheck: error: invalid --premium option 'cert'.\n", logger->str());
+        }
+        settings->cppcheckCfgProductName.clear();
+        settings->premiumArgs.clear();
+    }
+
     void premiumSafety() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--premium=safety", "file.cpp"};

From 17115d2f770d80563f5d2ea14845a650d4f150ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 12 Jan 2024 17:38:14 +0100
Subject: [PATCH 08/29] Fix #12342 (Show premium autosar/misra/cert style
 issues even if --enable is not used) (#5874)

---
 lib/cppcheck.cpp      | 20 ++++++++++++++++++--
 lib/cppcheck.h        |  2 ++
 test/testcppcheck.cpp | 26 ++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 9f912697db8..4b8807121f9 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -1465,8 +1465,12 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
                     continue;
                 errmsg.severity = Severity::internal;
             }
-            else if (!mSettings.severity.isEnabled(errmsg.severity))
-                continue;
+            else if (!mSettings.severity.isEnabled(errmsg.severity)) {
+                // Do not filter out premium misra/cert/autosar messages that has been
+                // explicitly enabled with a --premium option
+                if (!isPremiumCodingStandardId(errmsg.id))
+                    continue;
+            }
             errmsg.file0 = file0;
 
             reportErr(errmsg);
@@ -1859,3 +1863,15 @@ void CppCheck::printTimerResults(SHOWTIME_MODES mode)
 {
     s_timerResults.showResults(mode);
 }
+
+bool CppCheck::isPremiumCodingStandardId(const std::string& id) const {
+    if (mSettings.premiumArgs.find("--misra") != std::string::npos) {
+        if (startsWith(id, "misra-") || startsWith(id, "premium-misra-"))
+            return true;
+    }
+    if (mSettings.premiumArgs.find("--cert") != std::string::npos && startsWith(id, "premium-cert-"))
+        return true;
+    if (mSettings.premiumArgs.find("--autosar") != std::string::npos && startsWith(id, "premium-autosar-"))
+        return true;
+    return false;
+}
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
index 8f31d5d75d9..f394330e29b 100644
--- a/lib/cppcheck.h
+++ b/lib/cppcheck.h
@@ -150,6 +150,8 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
     static void resetTimerResults();
     static void printTimerResults(SHOWTIME_MODES mode);
 
+    bool isPremiumCodingStandardId(const std::string& id) const;
+
 private:
 #ifdef HAVE_RULES
     /** Are there "simple" rules */
diff --git a/test/testcppcheck.cpp b/test/testcppcheck.cpp
index 1932397c460..48c93eebced 100644
--- a/test/testcppcheck.cpp
+++ b/test/testcppcheck.cpp
@@ -54,6 +54,7 @@ class TestCppcheck : public TestFixture {
         TEST_CASE(checkWithFS);
         TEST_CASE(suppress_error_library);
         TEST_CASE(unique_errors);
+        TEST_CASE(isPremiumCodingStandardId);
     }
 
     void getErrorMessages() const {
@@ -179,6 +180,31 @@ class TestCppcheck : public TestFixture {
         ASSERT_EQUALS("nullPointer", it->id);
     }
 
+    void isPremiumCodingStandardId() const {
+        ErrorLogger2 errorLogger;
+        CppCheck cppcheck(errorLogger, false, {});
+
+        cppcheck.settings().premiumArgs = "";
+        ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("misra-c2012-0.0"));
+        ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("misra-c2023-0.0"));
+        ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c2012-0.0"));
+        ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c2023-0.0"));
+        ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c++2008-0.0.0"));
+        ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c++2023-0.0.0"));
+        ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-cert-int50-cpp"));
+        ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-autosar-0-0-0"));
+
+        cppcheck.settings().premiumArgs = "--misra-c-2012 --cert-c++-2016 --autosar";
+        ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("misra-c2012-0.0"));
+        ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("misra-c2023-0.0"));
+        ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c2012-0.0"));
+        ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c2023-0.0"));
+        ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c++2008-0.0.0"));
+        ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c++2023-0.0.0"));
+        ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-cert-int50-cpp"));
+        ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-autosar-0-0-0"));
+    }
+
     // TODO: test suppressions
     // TODO: test all with FS
 };

From a712e1ad5bcda3329232c3021001ea44f1b5999f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 13 Jan 2024 15:21:29 +0100
Subject: [PATCH 09/29] Set version 2.13.1

---
 cli/main.cpp                  | 2 +-
 cmake/versions.cmake          | 2 +-
 lib/version.h                 | 2 +-
 win_installer/productInfo.wxi | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cli/main.cpp b/cli/main.cpp
index 23aad4e85ce..f2298262456 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -20,7 +20,7 @@
 /**
  *
  * @mainpage Cppcheck
- * @version 2.13.0
+ * @version 2.13.1
  *
  * @section overview_sec Overview
  * Cppcheck is a simple tool for static analysis of C/C++ code.
diff --git a/cmake/versions.cmake b/cmake/versions.cmake
index dfeb5d144d0..0e36a76a616 100644
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@@ -1,6 +1,6 @@
 # Version for libraries CPP
 # Version string must have 3 "parts". https://sourceforge.net/p/cppcheck/discussion/development/thread/e57efb2b62/
-SET(VERSION "2.13.0")
+SET(VERSION "2.13.1")
 STRING(REGEX MATCHALL "[0-9]+" VERSION_PARTS "${VERSION}")
 LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
 LIST(GET VERSION_PARTS 1 VERSION_MINOR)
diff --git a/lib/version.h b/lib/version.h
index 38f9406c0a6..bee54eb3b15 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -7,7 +7,7 @@
 #define CPPCHECK_MAJOR_VERSION 2
 #define CPPCHECK_MINOR_VERSION 13
 #define CPPCHECK_DEVMINOR_VERSION 13
-#define CPPCHECK_FIX_VERSION 0
+#define CPPCHECK_FIX_VERSION 1
 
 #define STRINGIFY(x) STRING(x)
 #define STRING(VER) #VER
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index 918f7dc3507..20d790190e2 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define ProductName = "Cppcheck $(var.Platform) 2.13.0" ?>
+  <?define ProductName = "Cppcheck $(var.Platform) 2.13.1" ?>
   <?define ProductNameShort = "Cppcheck" ?>
-  <?define ProductVersion = "2.13.0" ?>
+  <?define ProductVersion = "2.13.1" ?>
 
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>

From 54d3e7c4c73cc30392ef047fcf8fa74e6a3e7f31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 13 Jan 2024 15:24:29 +0100
Subject: [PATCH 10/29] Update release notes for 2.13.1

---
 releasenotes.txt | 47 +++++------------------------------------------
 1 file changed, 5 insertions(+), 42 deletions(-)

diff --git a/releasenotes.txt b/releasenotes.txt
index e8c4cedd404..921972cf8fa 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,45 +1,8 @@
-Release Notes for Cppcheck 2.13
+Release Notes for Cppcheck 2.13.1
 
-New checks:
-- passedByValueCallback for functions which take a parameter by value but are used as callbacks (subset of passedByValue)
-- returnImplicitInt for C functions without return type (previously reported as a debug message)
-- iterateByValue for iterating by value in a range-based for loop when a const reference could be used
-
-Changed interface:
-- Final report of active checkers is reported as a normal information message instead.
-
-Deprecations:
-- "--showtime=top5" has been deprecated and will be removed in Cppcheck 2.14. Please use --showtime=top5_file or --showtime=top5_summary instead.
-- Building with Qt5 has been deprecated (it went EOL in May 2023) and will be removed in a future version - please use Qt6 instead.
-
-Other:
-- Windows builds now default to the `native` platform instead of `win32A` or `win64`. Please specify it explicitly if you depend on it.
-- The undocumented and deprecated command-line options `--template <template>` and `--template-format <template>` has been removed. Please use `--template=` and `--template-format=` instead.
-- "--showtime=summary" will now show a single summary at the end instead of showing it after each file when using the thread execution (default on Windows)
-- added "--showtime=none" to disable any previously specified showtime report. "--showtime=" without parameter is no longer valid.
-- Multiple "--project" options are now prohibited. These would have overlapped each other and lead to unexpected behavior. Please use separate runs with a single "--project" option instead.
-- "--project" can also no longer be used in conjunction with additional source files.
-- If a addon cannot be found it will bail out immediately instead of continously writing errors and failing the analysis at the end.
-- clang-tidy was not invoked when the process-based executor (only available on Linux / default) was used.
-- Added CMake option "BUILD_MANPAGE" which adds the "man" target which will build the manpage. This requires xsltproc and the docbook XSLs to be installed.
-- Added some library configurations to the official Windows installer.
-- Removed some unused Qt DLLs from the official Windows installer.
-- Improved inline suppressions:
-  - You can suppress warnings in a block of code using "-begin" and "-end".
-  - You can suppress warnings in current file using "-file".
-  - You can suppress all warnings where macro is used using "-macro"
-- Cppcheck will now error out when an option, which requires code which is not compiled in, is being specified. In the past it might have silently ignored it or reported it as unknown.
-- Several macros defined by "limits.h"/"climits" will now be generated from the used platform condiguration and passed to the analysis.
-- fixed CMake build with UBSAN and GCC
-- Files will now be processed in the order as specified via the command-line.
-- Added command-line options "--fsigned-char" and "--funsigned-char" to control the signess of the "char" type. This overrides previously specified "--platform" options and is overrides by following ones.
-- An error is now reported when the "cppcheck.cfg" is invalid. The CLI version will also exit with a failure in that case.
-- Fixed loading of addons from "cppcheck.cfg" in the GUI application.
-- Markup files will now be processed after the regular source files when using multiple threads/processes (some issues remain - see Trac #12167 for details).
-- Added file name to ValueFlow "--debug" output.
-- Fixed build when using "clang-cl" in CMake.
+Usability:
+ * #12342: Show premium autosar/misra/cert style issues even if --enable is not used
+ * #12344: Better validation of --premium options
 
 Safety critical:
-- #10866 unsafe handling of unconditional #error
-- #12071 unsafe suppressions of critical errors
-- #12079 missing "misra-config" warning, calling unknown function in condition
+ * #12341: If --premium=safety is used then go to "safety mode". Do not override this in cppcheck.cfg

From a3f1c7780d9430c3f011cfe3ff7f918b4106abd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sun, 21 Jan 2024 20:37:01 +0100
Subject: [PATCH 11/29] Fix #12375 (misra.py: cache --get-rule-text result from
 premiumaddon) (#5894)

---
 addons/misra.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/misra.py b/addons/misra.py
index 680c8c1998f..aa2ab14e0a9 100755
--- a/addons/misra.py
+++ b/addons/misra.py
@@ -4281,6 +4281,14 @@ def reportError(self, location, num1, num2):
             errorId = 'c2012-' + str(num1) + '.' + str(num2)
             misra_severity = 'Undefined'
             cppcheck_severity = 'style'
+            if self.path_premium_addon and ruleNum not in self.ruleTexts:
+                for line in cppcheckdata.cmd_output([self.path_premium_addon, '--cli', '--get-rule-text=' + errorId]).split('\n'):
+                    if len(line) > 1 and not line.startswith('{'):
+                        errmsg = line.strip()
+                        rule = Rule(num1, num2)
+                        rule.text = errmsg
+                        self.ruleTexts[rule.num] = rule
+                        break
             if ruleNum in self.ruleTexts:
                 errmsg = self.ruleTexts[ruleNum].text
                 if self.ruleTexts[ruleNum].misra_severity:
@@ -4291,11 +4299,6 @@ def reportError(self, location, num1, num2):
                     errmsg = 'misra violation (use --rule-texts=<file> to get proper output)'
                 else:
                     errmsg = 'misra violation (rule-texts-file not found: ' + self.ruleText_filename + ')'
-                if self.path_premium_addon:
-                    for line in cppcheckdata.cmd_output([self.path_premium_addon, '--cli', '--get-rule-text=' + errorId]).split('\n'):
-                        if len(line) > 1 and not line.startswith('{'):
-                            errmsg = line.strip()
-                            break
             else:
                 errmsg = 'misra violation %s with no text in the supplied rule-texts-file' % (ruleNum)
 

From ac5c2b8c12de4ea2eb75d0bcdd6a31cfe18e9b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 20 Jan 2024 15:42:50 +0100
Subject: [PATCH 12/29] Fixed #12369 (GUI: Compliance report for Misra C++
 2008) (#5900)

---
 gui/compliancereportdialog.cpp | 16 ++++++----------
 gui/mainwindow.cpp             |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/gui/compliancereportdialog.cpp b/gui/compliancereportdialog.cpp
index adcb25b4d6a..90d35f14cfa 100644
--- a/gui/compliancereportdialog.cpp
+++ b/gui/compliancereportdialog.cpp
@@ -96,17 +96,13 @@ ComplianceReportDialog::ComplianceReportDialog(ProjectFile* projectFile, QString
     mUI->mEditProjectName->setText(projectFile->getProjectName());
     connect(mUI->buttonBox, &QDialogButtonBox::clicked, this, &ComplianceReportDialog::buttonClicked);
     mUI->mCodingStandard->clear();
-    if (projectFile->getCodingStandards().contains("misra-c-2023"))
-        mUI->mCodingStandard->addItem("Misra C 2023");
-    else if (projectFile->getAddons().contains("misra"))
+    if (!projectFile->getCodingStandards().contains("misra-c-2023") && projectFile->getAddons().contains("misra"))
         mUI->mCodingStandard->addItem("Misra C 2012");
-    if (projectFile->getCodingStandards().contains("misra-c++-2008"))
-        mUI->mCodingStandard->addItem("Misra C++ 2008");
-    if (projectFile->getCodingStandards().contains("cert-c-2016"))
-        mUI->mCodingStandard->addItem("Cert C");
-    if (projectFile->getCodingStandards().contains("cert-c++-2016"))
-        mUI->mCodingStandard->addItem("Cert C++");
-    mUI->mCodingStandard->addItems(projectFile->getCodingStandards());
+    for (QString std: projectFile->getCodingStandards()) {
+        std[0] = std[0].toUpper();
+        std = std.replace("-", " ").replace(" c ", " C ").replace(" cpp ", " C++ ").replace(" c++ ", " C++ ");
+        mUI->mCodingStandard->addItem(std);
+    }
 }
 
 ComplianceReportDialog::~ComplianceReportDialog()
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index b454ee39585..ddcc422afad 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -1359,7 +1359,7 @@ void MainWindow::enableCheckButtons(bool enable)
     mUI->mActionAnalyzeDirectory->setEnabled(enable);
 
     if (isCppcheckPremium()) {
-        mUI->mActionComplianceReport->setEnabled(enable && mProjectFile && mProjectFile->getAddons().contains("misra"));
+        mUI->mActionComplianceReport->setEnabled(enable && mProjectFile && (mProjectFile->getAddons().contains("misra") || !mProjectFile->getCodingStandards().empty()));
     }
 }
 

From faad8ceb19f8efc0d57e45dc92722d4354254e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sun, 21 Jan 2024 21:46:22 +0100
Subject: [PATCH 13/29] Fixed #12370 (Premium misra/cert/autosar: enable all
 corresponding checkers in open source cppcheck) (#5901)

---
 cli/cmdlineparser.cpp        |   6 ++
 createrelease                |   4 +
 lib/checkautovariables.cpp   |   2 +-
 lib/checkbool.cpp            |   2 +-
 lib/checkclass.cpp           |  18 +++--
 lib/checkcondition.cpp       |  24 +++---
 lib/checkexceptionsafety.cpp |   7 +-
 lib/checkfunctions.cpp       |   6 +-
 lib/checkmemoryleak.cpp      |   2 +-
 lib/checkother.cpp           |  41 +++++++----
 lib/checkstl.cpp             |   6 +-
 lib/checktype.cpp            |   2 +-
 lib/checkunusedvar.cpp       |  12 +--
 lib/settings.cpp             | 138 +++++++++++++++++++++++++++++++++++
 lib/settings.h               |   2 +
 test/cli/premium_test.py     |  51 +++++++++++++
 test/cli/testutils.py        |   4 +-
 test/testcmdlineparser.cpp   |  30 ++++++++
 18 files changed, 302 insertions(+), 55 deletions(-)
 create mode 100644 test/cli/premium_test.py

diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 6b6eac98329..39dea95f80c 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -912,6 +912,12 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 mSettings.premiumArgs += "--" + p;
                 if (p == "misra-c-2012" || p == "misra-c-2023")
                     mSettings.addons.emplace("misra");
+                if (startsWith(p, "autosar") || startsWith(p, "cert") || startsWith(p, "misra")) {
+                    // All checkers related to the coding standard should be enabled. The coding standards
+                    // do not all undefined behavior or portability issues.
+                    mSettings.addEnabled("warning");
+                    mSettings.addEnabled("portability");
+                }
             }
 
             // --project
diff --git a/createrelease b/createrelease
index 96f09cb6638..c41e2c440bf 100755
--- a/createrelease
+++ b/createrelease
@@ -5,6 +5,10 @@
 # Create release candidate
 # ========================
 #
+# check every isPremiumEnabled call:
+# - every id should be in --errorlist
+# - premiumaddon: check coverage.py
+#
 # Windows installer:
 # - ensure latest build was successful
 # - ensure cfg files etc are included (win_installer/cppcheck.wxs)
diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp
index 895ee5387d1..c19f7ad9bac 100644
--- a/lib/checkautovariables.cpp
+++ b/lib/checkautovariables.cpp
@@ -210,7 +210,7 @@ void CheckAutoVariables::assignFunctionArg()
 {
     const bool printStyle = mSettings->severity.isEnabled(Severity::style);
     const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
-    if (!printStyle && !printWarning)
+    if (!printStyle && !printWarning && !mSettings->isPremiumEnabled("uselessAssignmentPtrArg"))
         return;
 
     logChecker("CheckAutoVariables::assignFunctionArg"); // style,warning
diff --git a/lib/checkbool.cpp b/lib/checkbool.cpp
index 4de26ea2801..bf2500972fb 100644
--- a/lib/checkbool.cpp
+++ b/lib/checkbool.cpp
@@ -50,7 +50,7 @@ static bool isBool(const Variable* var)
 //---------------------------------------------------------------------------
 void CheckBool::checkIncrementBoolean()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("incrementboolean"))
         return;
 
     logChecker("CheckBool::checkIncrementBoolean"); // style
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
index 9d3fa47fc0e..cc14d8c6477 100644
--- a/lib/checkclass.cpp
+++ b/lib/checkclass.cpp
@@ -127,7 +127,7 @@ void CheckClass::constructors()
 {
     const bool printStyle = mSettings->severity.isEnabled(Severity::style);
     const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
-    if (!printStyle && !printWarnings)
+    if (!printStyle && !printWarnings && !mSettings->isPremiumEnabled("uninitMemberVar"))
         return;
 
     logChecker("CheckClass::checkConstructors"); // style,warning
@@ -336,7 +336,7 @@ void CheckClass::constructors()
 
 void CheckClass::checkExplicitConstructors()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("noExplicitConstructor"))
         return;
 
     logChecker("CheckClass::checkExplicitConstructors"); // style
@@ -1275,7 +1275,7 @@ static bool checkFunctionUsage(const Function *privfunc, const Scope* scope)
 
 void CheckClass::privateFunctions()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedPrivateFunction"))
         return;
 
     logChecker("CheckClass::privateFunctions"); // style
@@ -1564,7 +1564,7 @@ void CheckClass::memsetErrorFloat(const Token *tok, const std::string &type)
 
 void CheckClass::operatorEqRetRefThis()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("operatorEqRetRefThis"))
         return;
 
     logChecker("CheckClass::operatorEqRetRefThis"); // style
@@ -2090,7 +2090,9 @@ void CheckClass::checkConst()
     if (!mSettings->certainty.isEnabled(Certainty::inconclusive))
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) &&
+        !mSettings->isPremiumEnabled("functionConst") &&
+        !mSettings->isPremiumEnabled("functionStatic"))
         return;
 
     logChecker("CheckClass::checkConst"); // style,inconclusive
@@ -2638,7 +2640,7 @@ namespace { // avoid one-definition-rule violation
 
 void CheckClass::initializerListOrder()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("initializerList"))
         return;
 
     // This check is not inconclusive.  However it only determines if the initialization
@@ -3112,7 +3114,7 @@ void CheckClass::copyCtorAndEqOperatorError(const Token *tok, const std::string
 
 void CheckClass::checkOverride()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("missingOverride"))
         return;
     if (mSettings->standards.cpp < Standards::CPP11)
         return;
@@ -3212,7 +3214,7 @@ static bool compareTokenRanges(const Token* start1, const Token* end1, const Tok
 
 void CheckClass::checkUselessOverride()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("uselessOverride"))
         return;
 
     logChecker("CheckClass::checkUselessOverride"); // style
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
index 8e5e3f134ba..38d20ed72a4 100644
--- a/lib/checkcondition.cpp
+++ b/lib/checkcondition.cpp
@@ -87,7 +87,7 @@ bool CheckCondition::isAliased(const std::set<int> &vars) const
 
 void CheckCondition::assignIf()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("assignIf"))
         return;
 
     logChecker("CheckCondition::assignIf"); // style
@@ -306,7 +306,7 @@ static bool isOperandExpanded(const Token *tok)
 
 void CheckCondition::checkBadBitmaskCheck()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("badBitmaskCheck"))
         return;
 
     logChecker("CheckCondition::checkBadBitmaskCheck"); // style
@@ -354,7 +354,7 @@ void CheckCondition::badBitmaskCheckError(const Token *tok, bool isNoOp)
 
 void CheckCondition::comparison()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("comparisonError"))
         return;
 
     logChecker("CheckCondition::comparison"); // style
@@ -474,7 +474,7 @@ bool CheckCondition::isOverlappingCond(const Token * const cond1, const Token *
 
 void CheckCondition::duplicateCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("duplicateCondition"))
         return;
 
     logChecker("CheckCondition::duplicateCondition"); // style
@@ -525,7 +525,7 @@ void CheckCondition::duplicateConditionError(const Token *tok1, const Token *tok
 
 void CheckCondition::multiCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("multiCondition"))
         return;
 
     logChecker("CheckCondition::multiCondition"); // style
@@ -1125,7 +1125,7 @@ void CheckCondition::checkIncorrectLogicOperator()
 {
     const bool printStyle = mSettings->severity.isEnabled(Severity::style);
     const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
-    if (!printWarning && !printStyle)
+    if (!printWarning && !printStyle && !mSettings->isPremiumEnabled("incorrectLogicOperator"))
         return;
     const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
 
@@ -1417,7 +1417,7 @@ static int countPar(const Token *tok1, const Token *tok2)
 //---------------------------------------------------------------------------
 void CheckCondition::clarifyCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("clarifyCondition"))
         return;
 
     const bool isC = mTokenizer->isC();
@@ -1483,7 +1483,9 @@ void CheckCondition::clarifyConditionError(const Token *tok, bool assign, bool b
 
 void CheckCondition::alwaysTrueFalse()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) &&
+        !mSettings->isPremiumEnabled("alwaysTrue") &&
+        !mSettings->isPremiumEnabled("alwaysFalse"))
         return;
 
     logChecker("CheckCondition::alwaysTrueFalse"); // style
@@ -1785,7 +1787,7 @@ void CheckCondition::pointerAdditionResultNotNullError(const Token *tok, const T
 
 void CheckCondition::checkDuplicateConditionalAssign()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("duplicateConditionalAssign"))
         return;
 
     logChecker("CheckCondition::checkDuplicateConditionalAssign"); // style
@@ -1864,7 +1866,7 @@ void CheckCondition::duplicateConditionalAssignError(const Token *condTok, const
 
 void CheckCondition::checkAssignmentInCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("assignmentInCondition"))
         return;
 
     logChecker("CheckCondition::checkAssignmentInCondition"); // style
@@ -1911,7 +1913,7 @@ void CheckCondition::assignmentInCondition(const Token *eq)
 
 void CheckCondition::checkCompareValueOutOfTypeRange()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("compareValueOutOfTypeRange"))
         return;
 
     if (mSettings->platform.type == Platform::Type::Native ||
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
index 2c404e8312e..bd217d8c545 100644
--- a/lib/checkexceptionsafety.cpp
+++ b/lib/checkexceptionsafety.cpp
@@ -169,7 +169,7 @@ void CheckExceptionSafety::deallocThrowError(const Token * const tok, const std:
 //---------------------------------------------------------------------------
 void CheckExceptionSafety::checkRethrowCopy()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("rethrowcopy"))
         return;
 
     logChecker("CheckExceptionSafety::checkRethrowCopy"); // style
@@ -213,7 +213,7 @@ void CheckExceptionSafety::rethrowCopyError(const Token * const tok, const std::
 //---------------------------------------------------------------------------
 void CheckExceptionSafety::checkCatchExceptionByValue()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("catchexceptionbyvalue"))
         return;
 
     logChecker("CheckExceptionSafety::checkCatchExceptionByValue"); // style
@@ -329,7 +329,8 @@ void CheckExceptionSafety::noexceptThrowError(const Token * const tok)
 //--------------------------------------------------------------------------
 void CheckExceptionSafety::unhandledExceptionSpecification()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) || !mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if ((!mSettings->severity.isEnabled(Severity::style) || !mSettings->certainty.isEnabled(Certainty::inconclusive)) &&
+        !mSettings->isPremiumEnabled("unhandledexceptionspecification"))
         return;
 
     logChecker("CheckExceptionSafety::unhandledExceptionSpecification"); // style,inconclusive
diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
index cd9b8f980d3..da7f6a734a2 100644
--- a/lib/checkfunctions.cpp
+++ b/lib/checkfunctions.cpp
@@ -242,7 +242,9 @@ void CheckFunctions::invalidFunctionArgStrError(const Token *tok, const std::str
 //---------------------------------------------------------------------------
 void CheckFunctions::checkIgnoredReturnValue()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::warning) &&
+        !mSettings->severity.isEnabled(Severity::style) &&
+        !mSettings->isPremiumEnabled("ignoredReturnValue"))
         return;
 
     logChecker("CheckFunctions::checkIgnoredReturnValue"); // style,warning
@@ -424,7 +426,7 @@ void CheckFunctions::checkMathFunctions()
     const bool styleC99 = mSettings->severity.isEnabled(Severity::style) && mSettings->standards.c != Standards::C89 && mSettings->standards.cpp != Standards::CPP03;
     const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
 
-    if (!styleC99 && !printWarnings)
+    if (!styleC99 && !printWarnings && !mSettings->isPremiumEnabled("wrongmathcall"))
         return;
 
     logChecker("CheckFunctions::checkMathFunctions"); // style,warning,c99,c++11
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index a3c7d4a0177..ad588558117 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -635,7 +635,7 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam
 
 void CheckMemoryLeakInClass::unsafeClassError(const Token *tok, const std::string &classname, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unsafeClassCanLeak"))
         return;
 
     reportError(tok, Severity::style, "unsafeClassCanLeak",
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index 3e324a6833d..0fb67986f37 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -154,7 +154,7 @@ void CheckOther::checkCastIntToCharAndBackError(const Token *tok, const std::str
 //---------------------------------------------------------------------------
 void CheckOther::clarifyCalculation()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("clarifyCalculation"))
         return;
 
     logChecker("CheckOther::clarifyCalculation"); // style
@@ -296,7 +296,10 @@ void CheckOther::suspiciousSemicolonError(const Token* tok)
 void CheckOther::warningOldStylePointerCast()
 {
     // Only valid on C++ code
-    if (!mSettings->severity.isEnabled(Severity::style) || !mTokenizer->isCPP())
+    if (!mTokenizer->isCPP())
+        return;
+
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("cstyleCast"))
         return;
 
     logChecker("CheckOther::warningOldStylePointerCast"); // style,c++
@@ -402,7 +405,7 @@ void CheckOther::invalidPointerCastError(const Token* tok, const std::string& fr
 
 void CheckOther::checkRedundantAssignment()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("redundantAssignment"))
         return;
 
     logChecker("CheckOther::checkRedundantAssignment"); // style
@@ -747,7 +750,11 @@ void CheckOther::suspiciousCaseInSwitchError(const Token* tok, const std::string
 //---------------------------------------------------------------------------
 void CheckOther::checkUnreachableCode()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    // misra-c-2012-2.1
+    // misra-c-2023-2.1
+    // misra-cpp-2008-0-1-1
+    // autosar
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unreachableCode"))
         return;
 
     logChecker("CheckOther::checkUnreachableCode"); // style
@@ -901,7 +908,7 @@ void CheckOther::checkVariableScope()
     if (mSettings->clang)
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("variableScope"))
         return;
 
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -1489,7 +1496,9 @@ static const Token* getVariableChangedStart(const Variable* p)
 
 void CheckOther::checkConstPointer()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) &&
+        !mSettings->isPremiumEnabled("constParameter") &&
+        !mSettings->isPremiumEnabled("constPointer"))
         return;
 
     logChecker("CheckOther::checkConstPointer"); // style
@@ -2048,7 +2057,7 @@ void CheckOther::zerodivError(const Token *tok, const ValueFlow::Value *value)
 
 void CheckOther::checkNanInArithmeticExpression()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("nanInArithmeticExpression"))
         return;
     logChecker("CheckOther::checkNanInArithmeticExpression"); // style
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
@@ -2078,7 +2087,7 @@ void CheckOther::checkMisusedScopedObject()
     if (mTokenizer->isC())
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedScopedObject"))
         return;
 
     logChecker("CheckOther::checkMisusedScopedObject"); // style,c++
@@ -2708,7 +2717,7 @@ void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalseError(const Token* to
 //---------------------------------------------------------------------------
 void CheckOther::checkSignOfUnsignedVariable()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unsignedLessThanZero"))
         return;
 
     logChecker("CheckOther::checkSignOfUnsignedVariable"); // style
@@ -3115,7 +3124,7 @@ void CheckOther::varFuncNullUBError(const Token *tok)
 
 void CheckOther::checkRedundantPointerOp()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("redundantPointerOp"))
         return;
 
     logChecker("CheckOther::checkRedundantPointerOp"); // style
@@ -3207,7 +3216,7 @@ void CheckOther::raceAfterInterlockedDecrementError(const Token* tok)
 
 void CheckOther::checkUnusedLabel()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("unusedLabel"))
         return;
 
     logChecker("CheckOther::checkUnusedLabel"); // style,warning
@@ -3415,7 +3424,7 @@ void CheckOther::checkFuncArgNamesDifferent()
     const bool inconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
     const bool warning = mSettings->severity.isEnabled(Severity::warning);
 
-    if (!(warning || (style && inconclusive)))
+    if (!(warning || (style && inconclusive)) && !mSettings->isPremiumEnabled("funcArgNamesDifferent"))
         return;
 
     logChecker("CheckOther::checkFuncArgNamesDifferent"); // style,warning,inconclusive
@@ -3556,7 +3565,7 @@ static const Token *findShadowed(const Scope *scope, const std::string &varname,
 
 void CheckOther::checkShadowVariables()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("shadowVariables"))
         return;
     logChecker("CheckOther::checkShadowVariables"); // style
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -3637,7 +3646,7 @@ static bool isVariableExprHidden(const Token* tok)
 
 void CheckOther::checkKnownArgument()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("knownArgument"))
         return;
     logChecker("CheckOther::checkKnownArgument"); // style
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -3738,7 +3747,7 @@ void CheckOther::knownArgumentError(const Token *tok, const Token *ftok, const V
 
 void CheckOther::checkKnownPointerToBool()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("knownPointerToBool"))
         return;
     logChecker("CheckOther::checkKnownPointerToBool"); // style
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -3837,7 +3846,7 @@ void CheckOther::comparePointersError(const Token *tok, const ValueFlow::Value *
 
 void CheckOther::checkModuloOfOne()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("moduloofone"))
         return;
 
     logChecker("CheckOther::checkModuloOfOne"); // style
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
index 7e0b9547d85..a1a9787e0f3 100644
--- a/lib/checkstl.cpp
+++ b/lib/checkstl.cpp
@@ -1789,7 +1789,7 @@ void CheckStl::sizeError(const Token *tok)
 
 void CheckStl::redundantCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("redundantIfRemove"))
         return;
 
     logChecker("CheckStl::redundantCondition"); // style
@@ -2843,7 +2843,7 @@ namespace {
 
 void CheckStl::useStlAlgorithm()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("useStlAlgorithm"))
         return;
 
     logChecker("CheckStl::useStlAlgorithm"); // style
@@ -3075,7 +3075,7 @@ static bool isKnownEmptyContainer(const Token* tok)
 
 void CheckStl::knownEmptyContainer()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("knownEmptyContainer"))
         return;
     logChecker("CheckStl::knownEmptyContainer"); // style
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
diff --git a/lib/checktype.cpp b/lib/checktype.cpp
index b8a3d26d448..733debc60e7 100644
--- a/lib/checktype.cpp
+++ b/lib/checktype.cpp
@@ -322,7 +322,7 @@ static bool checkTypeCombination(const ValueType& src, const ValueType& tgt, con
 
 void CheckType::checkLongCast()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("truncLongCastAssignment"))
         return;
 
     logChecker("CheckType::checkLongCast"); // style
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
index 101c886fe91..55ae8008a22 100644
--- a/lib/checkunusedvar.cpp
+++ b/lib/checkunusedvar.cpp
@@ -1149,7 +1149,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
 
 void CheckUnusedVar::checkFunctionVariableUsage()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->checkLibrary)
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->checkLibrary && !mSettings->isPremiumEnabled("unusedVariable"))
         return;
 
     logChecker("CheckUnusedVar::checkFunctionVariableUsage"); // style
@@ -1400,7 +1400,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
 
 void CheckUnusedVar::unusedVariableError(const Token *tok, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
         return;
 
     reportError(tok, Severity::style, "unusedVariable", "$symbol:" + varname + "\nUnused variable: $symbol", CWE563, Certainty::normal);
@@ -1408,7 +1408,7 @@ void CheckUnusedVar::unusedVariableError(const Token *tok, const std::string &va
 
 void CheckUnusedVar::allocatedButUnusedVariableError(const Token *tok, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
         return;
 
     reportError(tok, Severity::style, "unusedAllocatedMemory", "$symbol:" + varname + "\nVariable '$symbol' is allocated memory that is never used.", CWE563, Certainty::normal);
@@ -1416,7 +1416,7 @@ void CheckUnusedVar::allocatedButUnusedVariableError(const Token *tok, const std
 
 void CheckUnusedVar::unreadVariableError(const Token *tok, const std::string &varname, bool modified)
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
         return;
 
     if (modified)
@@ -1427,7 +1427,7 @@ void CheckUnusedVar::unreadVariableError(const Token *tok, const std::string &va
 
 void CheckUnusedVar::unassignedVariableError(const Token *tok, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
         return;
 
     reportError(tok, Severity::style, "unassignedVariable", "$symbol:" + varname + "\nVariable '$symbol' is not assigned a value.", CWE665, Certainty::normal);
@@ -1438,7 +1438,7 @@ void CheckUnusedVar::unassignedVariableError(const Token *tok, const std::string
 //---------------------------------------------------------------------------
 void CheckUnusedVar::checkStructMemberUsage()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
         return;
 
     logChecker("CheckUnusedVar::checkStructMemberUsage"); // style
diff --git a/lib/settings.cpp b/lib/settings.cpp
index 393ce377732..15dc9b41044 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -253,3 +253,141 @@ void Settings::setCheckLevelNormal()
     performanceValueFlowMaxSubFunctionArgs = 8;
     performanceValueFlowMaxIfCount = 100;
 }
+
+// TODO: auto generate these tables
+
+static const std::set<std::string> autosar_checkers{
+    "accessMoved",
+    "arrayIndexOutOfBounds",
+    "comparePointers",
+    "constParameter",
+    "cstyleCast",
+    "ctuOneDefinitionViolation",
+    "doubleFree",
+    "duplicateBreak",
+    "funcArgNamesDifferent",
+    "functionConst",
+    "functionStatic",
+    "invalidContainer",
+    "memleak",
+    "mismatchAllocDealloc",
+    "missingReturn",
+    "noExplicitConstructor",
+    "nullPointer",
+    "pointerOutOfBounds",
+    "unreadVariable",
+    "unusedValue",
+    "redundantAssignment",
+    "redundantInitialization",
+    "returnDanglingLifetime",
+    "shadowVariable",
+    "shiftTooManyBits",
+    "sizeofSideEffects",
+    "throwInDestructor",
+    "throwInNoexceptFunction",
+    "unreachableCode",
+    "uninitData",
+    "uninitMember",
+    "unusedVariable",
+    "useInitializerList",
+    "variableScope",
+    "virtualCallInConstructor",
+    "zeroDiv"
+};
+
+static const std::set<std::string> cert_c_checkers{
+    "danglingLifetime", "autoVariables", "invalidLifetime",
+    "unknownEvaluationOrder",
+    "uninitvar", "uninitdata", "uninitStructMember",
+    "nullPointer",
+    "sizeofCalculation",
+    "bitwiseOnBoolean",
+    "invalidFunctionArg",
+    "floatConversionOverflow",
+    "comparePointers",
+    "stringLiteralWrite",
+    "doubleFree",
+    "deallocret",
+    "deallocuse",
+    "memleak",
+    "autovarInvalidDeallocation",
+    "mismatchAllocDealloc",
+    "IOWithoutPositioning",
+    "resourceLeak",
+    "useClosedFile",
+    "invalidscanf",
+    "wrongPrintfScanfArgNum",
+    "invalidLengthModifierError",
+    "invalidScanfFormatWidth",
+    "wrongPrintfScanfParameterPositionError",
+    "missingReturn"
+};
+
+static const std::set<std::string> cert_cpp_checkers{
+    "deallocThrow", "exceptThrowInDestructor",
+    "ctuOneDefinitionViolation",
+    "sizeofCalculation",
+    "comparePointers",
+    "IOWithoutPositioning",
+    "virtualCallInConstructor",
+    "virtualDestructor",
+    "initializerList",
+    "operatorEqToSelf",
+    "missingReturn",
+};
+
+static const std::set<std::string> misra_c_checkers{
+    "alwaysFalse", "duplicateBreak",
+    "alwaysTrue", "redundantCondition", "redundantAssignment", "redundantAssignInSwitch", "unreadVariable",
+    "unusedVariable",
+    "unusedLabel",
+    "shadowVariable",
+    "funcArgNamesDifferent",
+    "constPointer",
+    "uninitvar",
+    "alwaysTrue", "alwaysFalse", "compareValueOutOfTypeRangeError", "knownConditionTrueFalse",
+    "unknownEvaluationOrder",
+    "sizeofCalculation",
+    "missingReturn",
+    "argumentSize",
+    "pointerOutOfBounds",
+    "comparePointers",
+    "danglingLifetime",
+    "overlappingWriteUnion", "overlappingWriteFunction",
+    "invalidFunctionArg",
+    "bufferAccessOutOfBounds",
+    "memleak", "resourceLeak", "memleakOnRealloc", "leakReturnValNotUsed", "leakNoVarFunctionCall",
+    "autovarInvalidDeallocation",
+    "incompatibleFileOpen",
+    "writeReadOnlyFile",
+    "useClosedFile"
+};
+
+static const std::set<std::string> misra_cpp_checkers{
+    "redundantAssignment", "unreadVariable", "varScope",
+    "shadowVariable",
+    "unknownEvaluationOrder",
+    "cstyleCast",
+    "constVariable", "constParameter",
+    "danglingLifetime",
+    "missingReturn",
+    "uninitMember",
+    "noExplicit",
+    "exceptThrowInDestructor",
+    "throwInDestructor"
+};
+
+bool Settings::isPremiumEnabled(const char id[]) const
+{
+    if (premiumArgs.find("autosar") != std::string::npos && autosar_checkers.count(id))
+        return true;
+    if (premiumArgs.find("cert-c-") != std::string::npos && cert_c_checkers.count(id))
+        return true;
+    if (premiumArgs.find("cert-c++") != std::string::npos && cert_cpp_checkers.count(id))
+        return true;
+    if (premiumArgs.find("misra-c-") != std::string::npos && misra_c_checkers.count(id))
+        return true;
+    if (premiumArgs.find("misra-c++") != std::string::npos && misra_cpp_checkers.count(id))
+        return true;
+    return false;
+}
diff --git a/lib/settings.h b/lib/settings.h
index be106ef98c3..ec7bb728acf 100644
--- a/lib/settings.h
+++ b/lib/settings.h
@@ -263,6 +263,8 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief Extra arguments for Cppcheck Premium addon */
     std::string premiumArgs;
 
+    bool isPremiumEnabled(const char id[]) const;
+
     /** @brief Using -E for debugging purposes */
     bool preprocessOnly{};
 
diff --git a/test/cli/premium_test.py b/test/cli/premium_test.py
new file mode 100644
index 00000000000..82d8bc03ef5
--- /dev/null
+++ b/test/cli/premium_test.py
@@ -0,0 +1,51 @@
+
+# python -m pytest premium_test.py
+
+import logging
+import os
+import shutil
+import sys
+import time
+import pytest
+
+from testutils import cppcheck, assert_cppcheck, __lookup_cppcheck_exe
+
+PRODUCT_NAME = 'Cppcheck Premium ' + str(time.time())
+
+
+def copy_cppcheck_premium(tmpdir):
+    exe = shutil.copy2(__lookup_cppcheck_exe(), tmpdir)
+
+    # add minimum cfg/std.cfg
+    test_cfg_folder = tmpdir.mkdir('cfg')
+    with open(test_cfg_folder.join('std.cfg'), 'wt') as f:
+        f.write('<?xml version="1.0"?>\n<def format="2"/>')
+
+    # add simple cppcheck.cfg
+    with open(tmpdir.join('cppcheck.cfg'), 'wt') as f:
+        f.write("""
+                {
+                    "addons": [],
+                    "productName": "NAME",
+                    "about": "NAME",
+                    "safety": false
+                }
+                """.replace('NAME', PRODUCT_NAME))
+ 
+    return exe    
+
+
+def test_misra_c_builtin_style_checks(tmpdir):
+    # FIXME this test does not work in ci-windows.yml (release build)
+    if sys.platform == 'win32':
+        return
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write('void foo() { int x; y = 0; }')
+
+    exe = copy_cppcheck_premium(tmpdir)
+    _, stdout, stderr = cppcheck(['--premium=autosar', test_file], cppcheck_exe=exe)
+    assert '' in stdout
+    assert '[unusedVariable]' in stderr
+
diff --git a/test/cli/testutils.py b/test/cli/testutils.py
index a27900a0e87..66a0e8d6e16 100644
--- a/test/cli/testutils.py
+++ b/test/cli/testutils.py
@@ -71,8 +71,8 @@ def __lookup_cppcheck_exe():
 
 
 # Run Cppcheck with args
-def cppcheck(args, env=None, remove_checkers_report=True):
-    exe = __lookup_cppcheck_exe()
+def cppcheck(args, env=None, remove_checkers_report=True, cwd=None, cppcheck_exe=None):
+    exe = cppcheck_exe if cppcheck_exe else __lookup_cppcheck_exe()
     assert exe is not None, 'no cppcheck binary found'
 
     logging.info(exe + ' ' + ' '.join(args))
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
index 678732b4f37..97565b92dd1 100644
--- a/test/testcmdlineparser.cpp
+++ b/test/testcmdlineparser.cpp
@@ -776,6 +776,7 @@ class TestCmdlineParser : public TestFixture {
 
     void enabledAll() {
         REDIRECT;
+        settings->severity.clear();
         const char * const argv[] = {"cppcheck", "--enable=all", "file.cpp"};
         ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
         ASSERT(settings->severity.isEnabled(Severity::style));
@@ -787,6 +788,7 @@ class TestCmdlineParser : public TestFixture {
 
     void enabledStyle() {
         REDIRECT;
+        settings->severity.clear();
         const char * const argv[] = {"cppcheck", "--enable=style", "file.cpp"};
         ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
         ASSERT(settings->severity.isEnabled(Severity::style));
@@ -799,6 +801,7 @@ class TestCmdlineParser : public TestFixture {
 
     void enabledPerformance() {
         REDIRECT;
+        settings->severity.clear();
         const char * const argv[] = {"cppcheck", "--enable=performance", "file.cpp"};
         ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
         ASSERT(!settings->severity.isEnabled(Severity::style));
@@ -811,6 +814,7 @@ class TestCmdlineParser : public TestFixture {
 
     void enabledPortability() {
         REDIRECT;
+        settings->severity.clear();
         const char * const argv[] = {"cppcheck", "--enable=portability", "file.cpp"};
         ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
         ASSERT(!settings->severity.isEnabled(Severity::style));
@@ -823,6 +827,7 @@ class TestCmdlineParser : public TestFixture {
 
     void enabledInformation() {
         REDIRECT;
+        settings->severity.clear();
         const char * const argv[] = {"cppcheck", "--enable=information", "file.cpp"};
         ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
         ASSERT(settings->severity.isEnabled(Severity::information));
@@ -832,6 +837,7 @@ class TestCmdlineParser : public TestFixture {
 
     void enabledUnusedFunction() {
         REDIRECT;
+        settings->severity.clear();
         const char * const argv[] = {"cppcheck", "--enable=unusedFunction", "file.cpp"};
         ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
         ASSERT(settings->checks.isEnabled(Checks::unusedFunction));
@@ -839,6 +845,7 @@ class TestCmdlineParser : public TestFixture {
 
     void enabledMissingInclude() {
         REDIRECT;
+        settings->severity.clear();
         const char * const argv[] = {"cppcheck", "--enable=missingInclude", "file.cpp"};
         ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
         ASSERT(settings->checks.isEnabled(Checks::missingInclude));
@@ -846,6 +853,7 @@ class TestCmdlineParser : public TestFixture {
 
     void disabledMissingIncludeWithInformation() {
         REDIRECT;
+        settings->severity.clear();
         const char * const argv[] = {"cppcheck", "--disable=missingInclude", "--enable=information", "file.cpp"};
         ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(4, argv));
         ASSERT(settings->severity.isEnabled(Severity::information));
@@ -855,6 +863,7 @@ class TestCmdlineParser : public TestFixture {
 
     void enabledMissingIncludeWithInformation() {
         REDIRECT;
+        settings->severity.clear();
         const char * const argv[] = {"cppcheck", "--enable=information", "--enable=missingInclude", "file.cpp"};
         ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(4, argv));
         ASSERT(settings->severity.isEnabled(Severity::information));
@@ -864,6 +873,7 @@ class TestCmdlineParser : public TestFixture {
 
     void enabledMissingIncludeWithInformationReverseOrder() {
         REDIRECT;
+        settings->severity.clear();
         const char * const argv[] = {"cppcheck", "--enable=missingInclude", "--enable=information", "file.cpp"};
         ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(4, argv));
         ASSERT(settings->severity.isEnabled(Severity::information));
@@ -874,6 +884,7 @@ class TestCmdlineParser : public TestFixture {
 #ifdef CHECK_INTERNAL
     void enabledInternal() {
         REDIRECT;
+        settings->severity.clear();
         const char * const argv[] = {"cppcheck", "--enable=internal", "file.cpp"};
         ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
         ASSERT(settings->checks.isEnabled(Checks::internalCheck));
@@ -882,6 +893,7 @@ class TestCmdlineParser : public TestFixture {
 
     void enabledMultiple() {
         REDIRECT;
+        settings->severity.clear();
         const char * const argv[] = {"cppcheck", "--enable=missingInclude,portability,warning", "file.cpp"};
         ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
         ASSERT(!settings->severity.isEnabled(Severity::style));
@@ -1191,16 +1203,34 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         settings->cppcheckCfgProductName = "Cppcheck Premium 0.0.0";
         {
+            settings->severity.clear();
+            const char * const argv[] = {"cppcheck", "--premium=autosar", "file.c"};
+            ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+            ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::warning));
+        }
+        {
+            settings->severity.clear();
             const char * const argv[] = {"cppcheck", "--premium=misra-c-2012", "file.c"};
             ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+            ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::warning));
         }
         {
+            settings->severity.clear();
             const char * const argv[] = {"cppcheck", "--premium=misra-c++-2023", "file.c"};
             ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+            ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::warning));
         }
         {
+            settings->severity.clear();
             const char * const argv[] = {"cppcheck", "--premium=cert-c++-2016", "file.c"};
             ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+            ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::warning));
+        }
+        {
+            settings->severity.clear();
+            const char * const argv[] = {"cppcheck", "--premium=safety", "file.c"};
+            ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+            ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::warning));
         }
         // invalid options
         {

From 99df2b1fa43852a782d3d0c15f7e3a03c2f357d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Tue, 23 Jan 2024 13:11:07 +0100
Subject: [PATCH 14/29] 2.13.2: Set versions

---
 cli/main.cpp                  | 2 +-
 cmake/versions.cmake          | 2 +-
 lib/version.h                 | 2 +-
 win_installer/productInfo.wxi | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cli/main.cpp b/cli/main.cpp
index f2298262456..4e07cccb791 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -20,7 +20,7 @@
 /**
  *
  * @mainpage Cppcheck
- * @version 2.13.1
+ * @version 2.13.2
  *
  * @section overview_sec Overview
  * Cppcheck is a simple tool for static analysis of C/C++ code.
diff --git a/cmake/versions.cmake b/cmake/versions.cmake
index 0e36a76a616..2aebb671235 100644
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@@ -1,6 +1,6 @@
 # Version for libraries CPP
 # Version string must have 3 "parts". https://sourceforge.net/p/cppcheck/discussion/development/thread/e57efb2b62/
-SET(VERSION "2.13.1")
+SET(VERSION "2.13.2")
 STRING(REGEX MATCHALL "[0-9]+" VERSION_PARTS "${VERSION}")
 LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
 LIST(GET VERSION_PARTS 1 VERSION_MINOR)
diff --git a/lib/version.h b/lib/version.h
index bee54eb3b15..eef92ee11b4 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -7,7 +7,7 @@
 #define CPPCHECK_MAJOR_VERSION 2
 #define CPPCHECK_MINOR_VERSION 13
 #define CPPCHECK_DEVMINOR_VERSION 13
-#define CPPCHECK_FIX_VERSION 1
+#define CPPCHECK_FIX_VERSION 2
 
 #define STRINGIFY(x) STRING(x)
 #define STRING(VER) #VER
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index 20d790190e2..41f9f861a27 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define ProductName = "Cppcheck $(var.Platform) 2.13.1" ?>
+  <?define ProductName = "Cppcheck $(var.Platform) 2.13.2" ?>
   <?define ProductNameShort = "Cppcheck" ?>
-  <?define ProductVersion = "2.13.1" ?>
+  <?define ProductVersion = "2.13.2" ?>
 
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>

From a1f4a2368834842c1606ad68288bf2bc7dbdc6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 30 Dec 2023 20:47:30 +0100
Subject: [PATCH 15/29] CI: Update Cppcheck Premium version and license (#5814)

---
 .github/workflows/cppcheck-premium.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cppcheck-premium.yml b/.github/workflows/cppcheck-premium.yml
index 2f9863d5e44..c19e557aee2 100644
--- a/.github/workflows/cppcheck-premium.yml
+++ b/.github/workflows/cppcheck-premium.yml
@@ -19,22 +19,23 @@ jobs:
     runs-on: ubuntu-22.04 # run on the latest image only
 
     env:
-      PREMIUM_VERSION: devdrop-20231105
+      PREMIUM_VERSION: 23.12.0
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Download cppcheckpremium
         run: |
-          wget https://files.cppchecksolutions.com/cppcheckpremium-${{ env.PREMIUM_VERSION }}-amd64.tar.gz
+          wget https://files.cppchecksolutions.com/${{ env.PREMIUM_VERSION }}/ubuntu-22.04/cppcheckpremium-${{ env.PREMIUM_VERSION }}-amd64.tar.gz
+          #wget https://files.cppchecksolutions.com/cppcheckpremium-${{ env.PREMIUM_VERSION }}-amd64.tar.gz
           tar xzf cppcheckpremium-${{ env.PREMIUM_VERSION }}-amd64.tar.gz
 
       - name: Generate a license file
         run: |
           echo cppcheck > cppcheck.lic
-          echo 231231 >> cppcheck.lic
+          echo 241231 >> cppcheck.lic
           echo 80000 >> cppcheck.lic
-          echo 57e08c39523ab54d >> cppcheck.lic
+          echo 53b72a908d7aeeee >> cppcheck.lic
           echo path:lib >> cppcheck.lic
 
       - name: Check

From 02832e1313430975e8a7fc4865eeab4daa2109ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Thu, 1 Feb 2024 12:07:15 +0100
Subject: [PATCH 16/29] settings.cpp: Update autosar+cert+misra checkers
 mappings (#5933)

---
 lib/settings.cpp | 254 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 192 insertions(+), 62 deletions(-)

diff --git a/lib/settings.cpp b/lib/settings.cpp
index 15dc9b41044..451747d4c99 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -256,14 +256,19 @@ void Settings::setCheckLevelNormal()
 
 // TODO: auto generate these tables
 
-static const std::set<std::string> autosar_checkers{
+static const std::set<std::string> autosarCheckers{
     "accessMoved",
+    "argumentSize",
     "arrayIndexOutOfBounds",
+    "arrayIndexOutOfBoundsCond",
+    "arrayIndexThenCheck",
+    "bufferAccessOutOfBounds",
     "comparePointers",
     "constParameter",
     "cstyleCast",
     "ctuOneDefinitionViolation",
     "doubleFree",
+    "duplInheritedMember",
     "duplicateBreak",
     "funcArgNamesDifferent",
     "functionConst",
@@ -272,122 +277,247 @@ static const std::set<std::string> autosar_checkers{
     "memleak",
     "mismatchAllocDealloc",
     "missingReturn",
+    "negativeIndex",
     "noExplicitConstructor",
     "nullPointer",
+    "nullPointerArithmetic",
+    "nullPointerArithmeticRedundantCheck",
+    "nullPointerDefaultArg",
+    "nullPointerRedundantCheck",
+    "objectIndex",
+    "overlappingWriteFunction",
+    "overlappingWriteUnion",
     "pointerOutOfBounds",
-    "unreadVariable",
-    "unusedValue",
+    "pointerOutOfBoundsCond",
+    "preprocessorErrorDirective",
     "redundantAssignment",
     "redundantInitialization",
     "returnDanglingLifetime",
-    "shadowVariable",
     "shiftTooManyBits",
     "sizeofSideEffects",
     "throwInDestructor",
     "throwInNoexceptFunction",
-    "unreachableCode",
     "uninitData",
     "uninitMember",
+    "unreachableCode",
+    "unreadVariable",
+    "unsignedLessThanZero",
+    "unusedFunction",
+    "unusedStructMember",
+    "unusedValue",
     "unusedVariable",
     "useInitializerList",
     "variableScope",
     "virtualCallInConstructor",
-    "zeroDiv"
+    "zerodiv",
+    "zerodivcond"
 };
 
-static const std::set<std::string> cert_c_checkers{
-    "danglingLifetime", "autoVariables", "invalidLifetime",
-    "unknownEvaluationOrder",
-    "uninitvar", "uninitdata", "uninitStructMember",
-    "nullPointer",
-    "sizeofCalculation",
+static const std::set<std::string> certCCheckers{
+    "IOWithoutPositioning",
+    "autoVariables",
+    "autovarInvalidDeallocation",
     "bitwiseOnBoolean",
-    "invalidFunctionArg",
-    "floatConversionOverflow",
     "comparePointers",
-    "stringLiteralWrite",
-    "doubleFree",
+    "danglingLifetime",
     "deallocret",
     "deallocuse",
+    "doubleFree",
+    "floatConversionOverflow",
+    "invalidFunctionArg",
+    "invalidLengthModifierError",
+    "invalidLifetime",
+    "invalidScanfFormatWidth",
+    "invalidscanf",
+    "leakReturnValNotUsed",
+    "leakUnsafeArgAlloc",
     "memleak",
-    "autovarInvalidDeallocation",
+    "memleakOnRealloc",
     "mismatchAllocDealloc",
-    "IOWithoutPositioning",
+    "missingReturn",
+    "nullPointer",
+    "nullPointerArithmetic",
+    "nullPointerArithmeticRedundantCheck",
+    "nullPointerDefaultArg",
+    "nullPointerRedundantCheck",
+    "preprocessorErrorDirective",
     "resourceLeak",
+    "sizeofCalculation",
+    "stringLiteralWrite",
+    "uninitStructMember",
+    "uninitdata",
+    "uninitvar",
+    "unknownEvaluationOrder",
     "useClosedFile",
-    "invalidscanf",
     "wrongPrintfScanfArgNum",
-    "invalidLengthModifierError",
-    "invalidScanfFormatWidth",
-    "wrongPrintfScanfParameterPositionError",
-    "missingReturn"
+    "wrongPrintfScanfParameterPositionError"
 };
 
-static const std::set<std::string> cert_cpp_checkers{
-    "deallocThrow", "exceptThrowInDestructor",
-    "ctuOneDefinitionViolation",
-    "sizeofCalculation",
-    "comparePointers",
+static const std::set<std::string> certCppCheckers{
     "IOWithoutPositioning",
-    "virtualCallInConstructor",
-    "virtualDestructor",
+    "accessMoved",
+    "comparePointers",
+    "containerOutOfBounds",
+    "ctuOneDefinitionViolation",
+    "deallocMismatch",
+    "deallocThrow",
+    "deallocuse",
+    "doubleFree",
+    "eraseDereference",
+    "exceptThrowInDestructor",
     "initializerList",
-    "operatorEqToSelf",
+    "invalidContainer",
+    "lifetime",
+    "memleak",
     "missingReturn",
+    "nullPointer",
+    "operatorEqToSelf",
+    "sizeofCalculation",
+    "uninitvar",
+    "virtualCallInConstructor",
+    "virtualDestructor"
 };
 
-static const std::set<std::string> misra_c_checkers{
-    "alwaysFalse", "duplicateBreak",
-    "alwaysTrue", "redundantCondition", "redundantAssignment", "redundantAssignInSwitch", "unreadVariable",
-    "unusedVariable",
-    "unusedLabel",
-    "shadowVariable",
-    "funcArgNamesDifferent",
+static const std::set<std::string> misrac2012Checkers{
+    "alwaysFalse",
+    "alwaysTrue",
+    "argumentSize",
+    "autovarInvalidDeallocation",
+    "bufferAccessOutOfBounds",
+    "comparePointers",
+    "compareValueOutOfTypeRangeError",
     "constPointer",
+    "danglingLifetime",
+    "duplicateBreak",
+    "error",
+    "funcArgNamesDifferent",
+    "incompatibleFileOpen",
+    "invalidFunctionArg",
+    "knownConditionTrueFalse",
+    "leakNoVarFunctionCall",
+    "leakReturnValNotUsed",
+    "memleak",
+    "memleakOnRealloc",
+    "missingReturn",
+    "overlappingWriteFunction",
+    "overlappingWriteUnion",
+    "pointerOutOfBounds",
+    "preprocessorErrorDirective",
+    "redundantAssignInSwitch",
+    "redundantAssignment",
+    "redundantCondition",
+    "resourceLeak",
+    "shadowVariable",
+    "sizeofCalculation",
+    "syntaxError",
     "uninitvar",
-    "alwaysTrue", "alwaysFalse", "compareValueOutOfTypeRangeError", "knownConditionTrueFalse",
     "unknownEvaluationOrder",
-    "sizeofCalculation",
-    "missingReturn",
+    "unreadVariable",
+    "unusedLabel",
+    "unusedVariable",
+    "useClosedFile",
+    "writeReadOnlyFile"
+};
+
+static const std::set<std::string> misrac2023Checkers{
+    "alwaysFalse",
+    "alwaysTrue",
     "argumentSize",
-    "pointerOutOfBounds",
+    "autovarInvalidDeallocation",
+    "bufferAccessOutOfBounds",
     "comparePointers",
+    "compareValueOutOfTypeRangeError",
+    "constPointer",
     "danglingLifetime",
-    "overlappingWriteUnion", "overlappingWriteFunction",
-    "invalidFunctionArg",
-    "bufferAccessOutOfBounds",
-    "memleak", "resourceLeak", "memleakOnRealloc", "leakReturnValNotUsed", "leakNoVarFunctionCall",
-    "autovarInvalidDeallocation",
+    "duplicateBreak",
+    "error",
+    "funcArgNamesDifferent",
     "incompatibleFileOpen",
-    "writeReadOnlyFile",
-    "useClosedFile"
-};
-
-static const std::set<std::string> misra_cpp_checkers{
-    "redundantAssignment", "unreadVariable", "varScope",
+    "invalidFunctionArg",
+    "knownConditionTrueFalse",
+    "leakNoVarFunctionCall",
+    "leakReturnValNotUsed",
+    "memleak",
+    "memleakOnRealloc",
+    "missingReturn",
+    "overlappingWriteFunction",
+    "overlappingWriteUnion",
+    "pointerOutOfBounds",
+    "preprocessorErrorDirective",
+    "redundantAssignInSwitch",
+    "redundantAssignment",
+    "redundantCondition",
+    "resourceLeak",
     "shadowVariable",
+    "sizeofCalculation",
+    "syntaxError",
+    "uninitvar",
     "unknownEvaluationOrder",
+    "unreadVariable",
+    "unusedLabel",
+    "unusedVariable",
+    "useClosedFile",
+    "writeReadOnlyFile"
+};
+
+static const std::set<std::string> misracpp2008Checkers{
+    "autoVariables",
+    "comparePointers",
+    "constParameter",
+    "constVariable",
     "cstyleCast",
-    "constVariable", "constParameter",
+    "ctuOneDefinitionViolation",
     "danglingLifetime",
+    "duplInheritedMember",
+    "duplicateBreak",
+    "exceptThrowInDestructor",
+    "funcArgNamesDifferent",
+    "functionConst",
+    "functionStatic",
     "missingReturn",
-    "uninitMember",
     "noExplicit",
-    "exceptThrowInDestructor",
-    "throwInDestructor"
+    "overlappingWriteFunction",
+    "overlappingWriteUnion",
+    "pointerOutOfBounds",
+    "preprocessorErrorDirective",
+    "redundantAssignment",
+    "redundantInitialization",
+    "returnReference",
+    "returnTempReference",
+    "shadowVariable",
+    "shiftTooManyBits",
+    "sizeofSideEffects",
+    "throwInDestructor",
+    "uninitDerivedMemberVar",
+    "uninitDerivedMemberVarPrivate",
+    "uninitMemberVar",
+    "uninitMemberVarPrivate",
+    "uninitStructMember",
+    "uninitdata",
+    "uninitvar",
+    "unknownEvaluationOrder",
+    "unreachableCode",
+    "unreadVariable",
+    "unsignedLessThanZero",
+    "unusedFunction",
+    "unusedStructMember",
+    "unusedVariable",
+    "varScope",
+    "variableScope",
+    "virtualCallInConstructor"
 };
 
 bool Settings::isPremiumEnabled(const char id[]) const
 {
-    if (premiumArgs.find("autosar") != std::string::npos && autosar_checkers.count(id))
+    if (premiumArgs.find("autosar") != std::string::npos && autosarCheckers.count(id))
         return true;
-    if (premiumArgs.find("cert-c-") != std::string::npos && cert_c_checkers.count(id))
+    if (premiumArgs.find("cert-c-") != std::string::npos && certCCheckers.count(id))
         return true;
-    if (premiumArgs.find("cert-c++") != std::string::npos && cert_cpp_checkers.count(id))
+    if (premiumArgs.find("cert-c++") != std::string::npos && certCppCheckers.count(id))
         return true;
-    if (premiumArgs.find("misra-c-") != std::string::npos && misra_c_checkers.count(id))
+    if (premiumArgs.find("misra-c-") != std::string::npos && (misrac2012Checkers.count(id) || misrac2023Checkers.count(id)))
         return true;
-    if (premiumArgs.find("misra-c++") != std::string::npos && misra_cpp_checkers.count(id))
+    if (premiumArgs.find("misra-c++") != std::string::npos && misracpp2008Checkers.count(id))
         return true;
     return false;
 }

From 3f8bb7ad4a0bd287a62b0a8e365b2130985a635a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Thu, 1 Feb 2024 21:25:37 +0100
Subject: [PATCH 17/29] Fix #12389 (GUI: premiumaddon is not executed properly
 anymore) (#5923)

---
 gui/mainwindow.cpp                       | 86 +++++++++++++++++-------
 gui/mainwindow.h                         |  4 +-
 gui/projectfile.cpp                      |  3 +
 gui/test/projectfile/testprojectfile.cpp | 20 ++++++
 gui/test/projectfile/testprojectfile.h   |  2 +
 lib/addoninfo.cpp                        | 22 ++++--
 6 files changed, 105 insertions(+), 32 deletions(-)

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index ddcc422afad..97385d456a6 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -486,6 +486,11 @@ void MainWindow::saveSettings() const
 
 void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, const bool checkConfiguration)
 {
+    QPair<bool,Settings> checkSettingsPair = getCppcheckSettings();
+    if (!checkSettingsPair.first)
+        return;
+    Settings& checkSettings = checkSettingsPair.second;
+
     clearResults();
 
     mIsLogfileLoaded = false;
@@ -522,7 +527,6 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
     checkLockDownUI(); // lock UI while checking
 
     mUI->mResults->setCheckDirectory(checkPath);
-    Settings checkSettings = getCppcheckSettings();
     checkSettings.force = false;
     checkSettings.checkLibrary = checkLibrary;
     checkSettings.checkConfiguration = checkConfiguration;
@@ -550,9 +554,14 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
 
 void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrary, const bool checkConfiguration)
 {
-    if (files.isEmpty()) {
+    if (files.isEmpty())
         return;
-    }
+
+    QPair<bool, Settings> checkSettingsPair = getCppcheckSettings();
+    if (!checkSettingsPair.first)
+        return;
+    Settings& checkSettings = checkSettingsPair.second;
+
     clearResults();
 
     mIsLogfileLoaded = false;
@@ -591,7 +600,6 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
     checkLockDownUI(); // lock UI while checking
 
     mUI->mResults->setCheckDirectory(checkPath);
-    Settings checkSettings = getCppcheckSettings();
     checkSettings.checkLibrary = checkLibrary;
     checkSettings.checkConfiguration = checkConfiguration;
 
@@ -614,6 +622,11 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
 
 void MainWindow::analyzeCode(const QString& code, const QString& filename)
 {
+    const QPair<bool, Settings>& checkSettingsPair = getCppcheckSettings();
+    if (!checkSettingsPair.first)
+        return;
+    const Settings& checkSettings = checkSettingsPair.second;
+
     // Initialize dummy ThreadResult as ErrorLogger
     ThreadResult result;
     result.setFiles(QStringList(filename));
@@ -628,7 +641,7 @@ void MainWindow::analyzeCode(const QString& code, const QString& filename)
 
     // Create CppCheck instance
     CppCheck cppcheck(result, true, nullptr);
-    cppcheck.settings() = getCppcheckSettings();
+    cppcheck.settings() = checkSettings;
 
     // Check
     checkLockDownUI();
@@ -905,13 +918,12 @@ bool MainWindow::tryLoadLibrary(Library *library, const QString& filename)
     return true;
 }
 
-void MainWindow::loadAddon(Settings &settings, const QString &filesDir, const QString &pythonCmd, const QString& addon)
+QString MainWindow::loadAddon(Settings &settings, const QString &filesDir, const QString &pythonCmd, const QString& addon)
 {
-    QString addonFilePath = ProjectFile::getAddonFilePath(filesDir, addon);
-    if (addonFilePath.isEmpty())
-        return; // TODO: report an error
+    const QString addonFilePath = fromNativePath(ProjectFile::getAddonFilePath(filesDir, addon));
 
-    addonFilePath.replace(QChar('\\'), QChar('/'));
+    if (addonFilePath.isEmpty())
+        return tr("File not found: '%1'").arg(addon);
 
     picojson::object obj;
     obj["script"] = picojson::value(addonFilePath.toStdString());
@@ -929,42 +941,54 @@ void MainWindow::loadAddon(Settings &settings, const QString &filesDir, const QS
             obj["args"] = picojson::value(arg.toStdString());
         }
     }
-    picojson::value json;
-    json.set(std::move(obj));
-    std::string json_str = json.serialize();
+
+    const std::string& json_str = picojson::value(obj).serialize();
 
     AddonInfo addonInfo;
-    addonInfo.getAddonInfo(json_str, settings.exename); // TODO: handle error
+    const std::string errmsg = addonInfo.getAddonInfo(json_str, settings.exename);
+    if (!errmsg.empty())
+        return tr("Failed to load/setup addon %1: %2").arg(addon, QString::fromStdString(errmsg));
     settings.addonInfos.emplace_back(std::move(addonInfo));
 
-    settings.addons.emplace(std::move(json_str));
+    settings.addons.emplace(json_str);
+
+    return "";
 }
 
-Settings MainWindow::getCppcheckSettings()
+QPair<bool,Settings> MainWindow::getCppcheckSettings()
 {
     saveSettings(); // Save settings
 
+    Settings::terminate(true);
     Settings result;
 
     result.exename = QCoreApplication::applicationFilePath().toStdString();
 
     const bool std = tryLoadLibrary(&result.library, "std.cfg");
-    if (!std)
-        QMessageBox::critical(this, tr("Error"), tr("Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=<directory> at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.").arg("std.cfg"));
+    if (!std) {
+        QMessageBox::critical(this, tr("Error"), tr("Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=<directory> at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.\n\nAnalysis is aborted.").arg("std.cfg"));
+        return {false, {}};
+    }
 
     const QString filesDir(getDataDir());
     const QString pythonCmd = fromNativePath(mSettings->value(SETTINGS_PYTHON_PATH).toString());
 
     {
         const QString cfgErr = QString::fromStdString(result.loadCppcheckCfg());
-        if (!cfgErr.isEmpty())
-            QMessageBox::critical(this, tr("Error"), tr("Failed to load %1 - %2").arg("cppcheck.cfg").arg(cfgErr));
+        if (!cfgErr.isEmpty()) {
+            QMessageBox::critical(this, tr("Error"), tr("Failed to load %1 - %2\n\nAnalysis is aborted.").arg("cppcheck.cfg").arg(cfgErr));
+            return {false, {}};
+        }
 
         const auto cfgAddons = result.addons;
         result.addons.clear();
         for (const std::string& addon : cfgAddons) {
             // TODO: support addons which are a script and not a file
-            loadAddon(result, filesDir, pythonCmd, QString::fromStdString(addon));
+            const QString addonError = loadAddon(result, filesDir, pythonCmd, QString::fromStdString(addon));
+            if (!addonError.isEmpty()) {
+                QMessageBox::critical(this, tr("Error"), tr("%1\n\nAnalysis is aborted.").arg(addonError));
+                return {false, {}};
+            }
         }
     }
 
@@ -1045,7 +1069,11 @@ Settings MainWindow::getCppcheckSettings()
             result.checkUnknownFunctionReturn.insert(s.toStdString());
 
         for (const QString& addon : mProjectFile->getAddons()) {
-            loadAddon(result, filesDir, pythonCmd, addon);
+            const QString addonError = loadAddon(result, filesDir, pythonCmd, addon);
+            if (!addonError.isEmpty()) {
+                QMessageBox::critical(this, tr("Error"), tr("%1\n\nAnalysis is aborted.").arg(addonError));
+                return {false, {}};
+            }
         }
 
         if (isCppcheckPremium()) {
@@ -1099,7 +1127,7 @@ Settings MainWindow::getCppcheckSettings()
 
     Settings::terminate(false);
 
-    return result;
+    return {true, std::move(result)};
 }
 
 void MainWindow::analysisDone()
@@ -1223,6 +1251,11 @@ void MainWindow::reAnalyzeSelected(const QStringList& files)
     if (mThread->isChecking())
         return;
 
+    const QPair<bool, Settings> checkSettingsPair = getCppcheckSettings();
+    if (!checkSettingsPair.first)
+        return;
+    const Settings& checkSettings = checkSettingsPair.second;
+
     // Clear details, statistics and progress
     mUI->mResults->clear(false);
     for (int i = 0; i < files.size(); ++i)
@@ -1242,7 +1275,6 @@ void MainWindow::reAnalyzeSelected(const QStringList& files)
     // considered in "Modified Files Check"  performed after "Selected Files Check"
     // TODO: Should we store per file CheckStartTime?
     QDateTime saveCheckStartTime = mThread->getCheckStartTime();
-    const Settings& checkSettings = getCppcheckSettings();
     mThread->check(checkSettings);
     mUI->mResults->setCheckSettings(checkSettings);
     mThread->setCheckStartTime(saveCheckStartTime);
@@ -1254,6 +1286,11 @@ void MainWindow::reAnalyze(bool all)
     if (files.empty())
         return;
 
+    const QPair<bool, Settings>& checkSettingsPair = getCppcheckSettings();
+    if (!checkSettingsPair.first)
+        return;
+    const Settings& checkSettings = checkSettingsPair.second;
+
     // Clear details, statistics and progress
     mUI->mResults->clear(all);
 
@@ -1268,7 +1305,6 @@ void MainWindow::reAnalyze(bool all)
         qDebug() << "Rechecking project file" << mProjectFile->getFilename();
 
     mThread->setCheckFiles(all);
-    const Settings& checkSettings = getCppcheckSettings();
     mThread->check(checkSettings);
     mUI->mResults->setCheckSettings(checkSettings);
 }
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 4b6b20f9ad3..b0f059218cf 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -315,7 +315,7 @@ private slots:
      *
      * @return Default cppcheck settings
      */
-    Settings getCppcheckSettings();
+    QPair<bool, Settings> getCppcheckSettings();
 
     /** @brief Load program settings */
     void loadSettings();
@@ -401,7 +401,7 @@ private slots:
      */
     bool tryLoadLibrary(Library *library, const QString& filename);
 
-    void loadAddon(Settings &settings, const QString &filesDir, const QString &pythonCmd, const QString& addon);
+    QString loadAddon(Settings &settings, const QString &filesDir, const QString &pythonCmd, const QString& addon);
 
     /**
      * @brief Update project MRU items in File-menu.
diff --git a/gui/projectfile.cpp b/gui/projectfile.cpp
index f24f6eece93..393063bb49d 100644
--- a/gui/projectfile.cpp
+++ b/gui/projectfile.cpp
@@ -1115,6 +1115,9 @@ void ProjectFile::SafeChecks::saveToXml(QXmlStreamWriter &xmlWriter) const
 
 QString ProjectFile::getAddonFilePath(QString filesDir, const QString &addon)
 {
+    if (QFile(addon).exists())
+        return addon;
+
     if (!filesDir.endsWith("/"))
         filesDir += "/";
 
diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
index 6e5e73b0f06..505a6e8937c 100644
--- a/gui/test/projectfile/testprojectfile.cpp
+++ b/gui/test/projectfile/testprojectfile.cpp
@@ -28,6 +28,7 @@
 
 #include <QList>
 #include <QStringList>
+#include <QTemporaryDir>
 #include <QtTest>
 
 // Mock...
@@ -116,4 +117,23 @@ void TestProjectFile::loadSimpleNoroot() const
     QCOMPARE(defines[0], QString("FOO"));
 }
 
+void TestProjectFile::getAddonFilePath() const
+{
+    QTemporaryDir tempdir;
+    QVERIFY(tempdir.isValid());
+    const QString filepath(tempdir.path() + "/addon.py");
+
+    QFile file(filepath);
+    QVERIFY(file.open(QIODevice::WriteOnly | QIODevice::Text));
+    file.close();
+
+    // Relative path to addon
+    QCOMPARE(ProjectFile::getAddonFilePath(tempdir.path(), "addon"), filepath);
+    QCOMPARE(ProjectFile::getAddonFilePath(tempdir.path(), "not exist"), QString());
+
+    // Absolute path to addon
+    QCOMPARE(ProjectFile::getAddonFilePath("/not/exist", filepath), filepath);
+    QCOMPARE(ProjectFile::getAddonFilePath(tempdir.path(), filepath), filepath);
+}
+
 QTEST_MAIN(TestProjectFile)
diff --git a/gui/test/projectfile/testprojectfile.h b/gui/test/projectfile/testprojectfile.h
index b0bc7d96969..47ed517f412 100644
--- a/gui/test/projectfile/testprojectfile.h
+++ b/gui/test/projectfile/testprojectfile.h
@@ -27,4 +27,6 @@ private slots:
     void loadSimple() const;
     void loadSimpleWithIgnore() const;
     void loadSimpleNoroot() const;
+
+    void getAddonFilePath() const;
 };
diff --git a/lib/addoninfo.cpp b/lib/addoninfo.cpp
index cfe720b81e7..66eabdccd4f 100644
--- a/lib/addoninfo.cpp
+++ b/lib/addoninfo.cpp
@@ -80,11 +80,18 @@ static std::string parseAddonInfo(AddonInfo& addoninfo, const picojson::value &j
         addoninfo.python = "";
     }
 
-    if (obj.count("executable")) {
-        if (!obj["executable"].is<std::string>())
-            return "Loading " + fileName + " failed. executable must be a string.";
-        addoninfo.executable = getFullPath(obj["executable"].get<std::string>(), fileName);
-        return "";
+    {
+        const auto it = obj.find("executable");
+        if (it != obj.cend()) {
+            const auto& val = it->second;
+            if (!val.is<std::string>())
+                return "Loading " + fileName + " failed. 'executable' must be a string.";
+            const std::string e = val.get<std::string>();
+            addoninfo.executable = getFullPath(e, fileName);
+            if (addoninfo.executable.empty())
+                addoninfo.executable = e;
+            return ""; // <- do not load both "executable" and "script".
+        }
     }
 
     return addoninfo.getAddonInfo(obj["script"].get<std::string>(), exename);
@@ -126,6 +133,11 @@ std::string AddonInfo::getAddonInfo(const std::string &fileName, const std::stri
     std::ifstream fin(fileName);
     if (!fin.is_open())
         return "Failed to open " + fileName;
+    if (name.empty()) {
+        name = Path::fromNativeSeparators(fileName);
+        if (name.find('/') != std::string::npos)
+            name = name.substr(name.rfind('/') + 1);
+    }
     picojson::value json;
     fin >> json;
     return parseAddonInfo(*this, json, fileName, exename);

From badd5e03ff8dfc4c2559632231fb892fc8a5c030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 2 Feb 2024 14:25:46 +0100
Subject: [PATCH 18/29] bumped simplecpp to 1.1.1 (#5938)

---
 externals/simplecpp/simplecpp.cpp | 16 +++++++++++++---
 externals/simplecpp/simplecpp.h   |  4 +++-
 lib/preprocessor.cpp              |  2 ++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/externals/simplecpp/simplecpp.cpp b/externals/simplecpp/simplecpp.cpp
index 881b7c7f6fc..7c05fb6c9cb 100644
--- a/externals/simplecpp/simplecpp.cpp
+++ b/externals/simplecpp/simplecpp.cpp
@@ -398,7 +398,10 @@ class FileStream : public simplecpp::TokenList::Stream {
         , lastCh(0)
         , lastStatus(0)
     {
-        assert(file != nullptr);
+        if (!file) {
+            const std::vector<std::string> location;
+            throw simplecpp::Output(location, simplecpp::Output::FILE_NOT_FOUND, "File is missing: " + filename);
+        }
         init();
     }
 
@@ -455,8 +458,15 @@ simplecpp::TokenList::TokenList(std::istream &istr, std::vector<std::string> &fi
 simplecpp::TokenList::TokenList(const std::string &filename, std::vector<std::string> &filenames, OutputList *outputList)
         : frontToken(nullptr), backToken(nullptr), files(filenames)
 {
-    FileStream stream(filename);
-    readfile(stream,filename,outputList);
+    try
+    {
+        FileStream stream(filename);
+        readfile(stream,filename,outputList);
+    }
+    catch(const simplecpp::Output & e) // TODO handle extra type of errors
+    {
+        outputList->push_back(e);
+    }
 }
 
 simplecpp::TokenList::TokenList(const TokenList &other) : frontToken(nullptr), backToken(nullptr), files(other.files)
diff --git a/externals/simplecpp/simplecpp.h b/externals/simplecpp/simplecpp.h
index 55a78b451c9..ce4cc188eb7 100644
--- a/externals/simplecpp/simplecpp.h
+++ b/externals/simplecpp/simplecpp.h
@@ -193,8 +193,10 @@ namespace simplecpp {
             SYNTAX_ERROR,
             PORTABILITY_BACKSLASH,
             UNHANDLED_CHAR_ERROR,
-            EXPLICIT_INCLUDE_NOT_FOUND
+            EXPLICIT_INCLUDE_NOT_FOUND,
+            FILE_NOT_FOUND
         } type;
+        explicit Output(const std::vector<std::string> &files, Output::Type id, const std::string & errMsg ) : type(id), location(files), msg(errMsg) {}
         Location location;
         std::string msg;
     };
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index efad79ac3f7..be5e8ee7e88 100644
--- a/lib/preprocessor.cpp
+++ b/lib/preprocessor.cpp
@@ -750,6 +750,7 @@ bool Preprocessor::hasErrors(const simplecpp::Output &output)
     case simplecpp::Output::SYNTAX_ERROR:
     case simplecpp::Output::UNHANDLED_CHAR_ERROR:
     case simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND:
+    case simplecpp::Output::FILE_NOT_FOUND:
         return true;
     case simplecpp::Output::WARNING:
     case simplecpp::Output::MISSING_HEADER:
@@ -889,6 +890,7 @@ void Preprocessor::reportOutput(const simplecpp::OutputList &outputList, bool sh
             error(out.location.file(), out.location.line, out.msg);
             break;
         case simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND:
+        case simplecpp::Output::FILE_NOT_FOUND:
             error(emptyString, 0, out.msg);
             break;
         }

From 13f68e158d99a3df5d65dd8f619c3d6cd73f5587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 2 Feb 2024 15:53:43 +0100
Subject: [PATCH 19/29] bump simplecpp to 1.1.2 (#5939)

---
 externals/simplecpp/simplecpp.cpp | 8 ++++----
 externals/simplecpp/simplecpp.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/externals/simplecpp/simplecpp.cpp b/externals/simplecpp/simplecpp.cpp
index 7c05fb6c9cb..199100c779b 100644
--- a/externals/simplecpp/simplecpp.cpp
+++ b/externals/simplecpp/simplecpp.cpp
@@ -393,14 +393,14 @@ class StdIStream : public simplecpp::TokenList::Stream {
 class FileStream : public simplecpp::TokenList::Stream {
 public:
     // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
-    EXPLICIT FileStream(const std::string &filename)
+    EXPLICIT FileStream(const std::string &filename, std::vector<std::string> &files)
         : file(fopen(filename.c_str(), "rb"))
         , lastCh(0)
         , lastStatus(0)
     {
         if (!file) {
-            const std::vector<std::string> location;
-            throw simplecpp::Output(location, simplecpp::Output::FILE_NOT_FOUND, "File is missing: " + filename);
+            files.push_back(filename);
+            throw simplecpp::Output(files, simplecpp::Output::FILE_NOT_FOUND, "File is missing: " + filename);
         }
         init();
     }
@@ -460,7 +460,7 @@ simplecpp::TokenList::TokenList(const std::string &filename, std::vector<std::st
 {
     try
     {
-        FileStream stream(filename);
+        FileStream stream(filename, filenames);
         readfile(stream,filename,outputList);
     }
     catch(const simplecpp::Output & e) // TODO handle extra type of errors
diff --git a/externals/simplecpp/simplecpp.h b/externals/simplecpp/simplecpp.h
index ce4cc188eb7..cd8b2dc8ab2 100644
--- a/externals/simplecpp/simplecpp.h
+++ b/externals/simplecpp/simplecpp.h
@@ -196,7 +196,7 @@ namespace simplecpp {
             EXPLICIT_INCLUDE_NOT_FOUND,
             FILE_NOT_FOUND
         } type;
-        explicit Output(const std::vector<std::string> &files, Output::Type id, const std::string & errMsg ) : type(id), location(files), msg(errMsg) {}
+        explicit Output(const std::vector<std::string>& files, Type type, const std::string& msg) : type(type), location(files), msg(msg) {}
         Location location;
         std::string msg;
     };

From 3d18f84c19b0cd2101b189748caf6abca51f096a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 2 Feb 2024 20:36:21 +0100
Subject: [PATCH 20/29] run tools/get_checkers.py to update list of premium
 checkers

---
 lib/checkers.cpp | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/lib/checkers.cpp b/lib/checkers.cpp
index da054e635e7..94d2904fe95 100644
--- a/lib/checkers.cpp
+++ b/lib/checkers.cpp
@@ -291,7 +291,7 @@ namespace checkers {
         {"Cert C++: ERR51-CPP","style"},
         {"Cert C++: ERR52-CPP","style"},
         {"Cert C++: ERR53-CPP",""},
-        {"Cert C++: ERR54-CPP",""},
+        {"Cert C++: ERR54-CPP","style"},
         {"Cert C++: ERR55-CPP",""},
         {"Cert C++: ERR56-CPP",""},
         {"Cert C++: ERR58-CPP",""},
@@ -402,17 +402,23 @@ namespace checkers {
         {"Cert C: STR32-C","warning"},
         {"Cert C: STR34-C","warning"},
         {"Cert C: STR38-C","style"},
+        {"Misra C++ 2023: 21.20.1",""},
+        {"Misra C++ 2023: 21.20.2",""},
+        {"Misra C++ 2023: 6.7.1",""},
         {"Misra C++: M0-1-11","style"},
         {"Misra C++: M0-1-12","style"},
         {"Misra C++: M0-1-4","style"},
         {"Misra C++: M0-1-5","style"},
         {"Misra C++: M0-1-7","style"},
         {"Misra C++: M0-1-8","style"},
+        {"Misra C++: M0-3-2","style"},
+        {"Misra C++: M1-0-1","portability"},
         {"Misra C++: M10-1-1","style"},
         {"Misra C++: M10-1-2","style"},
         {"Misra C++: M10-1-3","style"},
         {"Misra C++: M10-2-1","style"},
         {"Misra C++: M10-3-1","style"},
+        {"Misra C++: M10-3-2","style"},
         {"Misra C++: M10-3-3","style"},
         {"Misra C++: M11-0-1","style"},
         {"Misra C++: M12-1-2","style"},
@@ -435,13 +441,19 @@ namespace checkers {
         {"Misra C++: M15-3-2","warning"},
         {"Misra C++: M15-3-3",""},
         {"Misra C++: M15-3-4",""},
+        {"Misra C++: M15-3-6","style"},
+        {"Misra C++: M15-3-7","style"},
         {"Misra C++: M15-4-1","style"},
         {"Misra C++: M15-5-2",""},
         {"Misra C++: M16-0-1","style"},
         {"Misra C++: M16-0-2","style"},
         {"Misra C++: M16-0-3","style"},
         {"Misra C++: M16-0-4","style"},
+        {"Misra C++: M16-0-6","style"},
+        {"Misra C++: M16-0-7","style"},
+        {"Misra C++: M16-0-8","style"},
         {"Misra C++: M16-1-1","style"},
+        {"Misra C++: M16-1-2","style"},
         {"Misra C++: M16-2-1","style"},
         {"Misra C++: M16-2-2","style"},
         {"Misra C++: M16-2-3","style"},
@@ -468,8 +480,11 @@ namespace checkers {
         {"Misra C++: M2-10-4","style"},
         {"Misra C++: M2-10-5","style"},
         {"Misra C++: M2-10-6","style"},
+        {"Misra C++: M2-13-2","style"},
+        {"Misra C++: M2-13-3","style"},
         {"Misra C++: M2-13-4","style"},
         {"Misra C++: M2-13-5","style"},
+        {"Misra C++: M2-3-1","style"},
         {"Misra C++: M2-7-1","style"},
         {"Misra C++: M2-7-2","style"},
         {"Misra C++: M2-7-3","style"},
@@ -503,7 +518,10 @@ namespace checkers {
         {"Misra C++: M5-0-7","style"},
         {"Misra C++: M5-0-8","style"},
         {"Misra C++: M5-0-9","style"},
+        {"Misra C++: M5-14-1","style"},
         {"Misra C++: M5-17-1","style"},
+        {"Misra C++: M5-18-1","style"},
+        {"Misra C++: M5-19-1","style"},
         {"Misra C++: M5-2-1","style"},
         {"Misra C++: M5-2-10","style"},
         {"Misra C++: M5-2-11","style"},
@@ -518,8 +536,15 @@ namespace checkers {
         {"Misra C++: M5-3-1","style"},
         {"Misra C++: M5-3-2","style"},
         {"Misra C++: M5-3-3","style"},
+        {"Misra C++: M6-2-1","style"},
+        {"Misra C++: M6-2-2","style"},
         {"Misra C++: M6-2-3","style"},
+        {"Misra C++: M6-3-1","style"},
+        {"Misra C++: M6-4-1","style"},
+        {"Misra C++: M6-4-2","style"},
+        {"Misra C++: M6-4-3","style"},
         {"Misra C++: M6-4-4","style"},
+        {"Misra C++: M6-4-5","style"},
         {"Misra C++: M6-4-6","style"},
         {"Misra C++: M6-4-7","style"},
         {"Misra C++: M6-4-8","style"},
@@ -530,6 +555,7 @@ namespace checkers {
         {"Misra C++: M6-5-5","style"},
         {"Misra C++: M6-5-6","style"},
         {"Misra C++: M6-6-1","style"},
+        {"Misra C++: M6-6-2","style"},
         {"Misra C++: M6-6-3","style"},
         {"Misra C++: M6-6-4","style"},
         {"Misra C++: M6-6-5","style"},
@@ -563,14 +589,30 @@ namespace checkers {
         {"Misra C: 10.7","style"},
         {"Misra C: 10.8","style"},
         {"Misra C: 11.10","style"},
+        {"Misra C: 12.3","style"},
         {"Misra C: 12.6",""},
+        {"Misra C: 13.1","style"},
+        {"Misra C: 13.2","style"},
+        {"Misra C: 13.3","style"},
+        {"Misra C: 13.4","style"},
+        {"Misra C: 13.5","style"},
+        {"Misra C: 13.6","style"},
+        {"Misra C: 15.5",""},
+        {"Misra C: 16.3","style"},
         {"Misra C: 17.10","style"},
         {"Misra C: 17.11","style"},
         {"Misra C: 17.12","style"},
+        {"Misra C: 17.13",""},
+        {"Misra C: 17.3",""},
         {"Misra C: 17.9","style"},
         {"Misra C: 18.10","style"},
+        {"Misra C: 18.5","style"},
+        {"Misra C: 18.8","style"},
         {"Misra C: 18.9","style"},
+        {"Misra C: 20.3","style"},
+        {"Misra C: 21.1","style"},
         {"Misra C: 21.12","style"},
+        {"Misra C: 21.16","style"},
         {"Misra C: 21.22","style"},
         {"Misra C: 21.23","style"},
         {"Misra C: 21.24","style"},
@@ -601,6 +643,7 @@ namespace checkers {
         {"Misra C: 8.15","style"},
         {"Misra C: 8.16","style"},
         {"Misra C: 8.17","style"},
+        {"Misra C: 8.3","style"},
         {"Misra C: 9.6","style"},
         {"Misra C: 9.7",""},
         {"PremiumCheckBufferOverrun::addressOfPointerArithmetic","warning"},

From ebc90d3c2009cd7edf1158b05e6eef0e26096e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 3 Feb 2024 13:30:07 +0100
Subject: [PATCH 21/29] CI: Update Misra C++ suppressions

---
 cppcheckpremium-suppressions | 47 ++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/cppcheckpremium-suppressions b/cppcheckpremium-suppressions
index 8ca95c7ec9c..2c7b1c1ea6b 100644
--- a/cppcheckpremium-suppressions
+++ b/cppcheckpremium-suppressions
@@ -42,6 +42,9 @@ premium-misra-cpp-2008-0-1-12
 # we sometimes don't care about return value from functions
 premium-misra-cpp-2008-0-1-7
 
+# we allow C++11
+premium-misra-cpp-2008-1-0-1
+
 # TODO: can we prevent commented out code?
 premium-misra-cpp-2008-2-7-2
 premium-misra-cpp-2008-2-7-3
@@ -52,6 +55,9 @@ premium-misra-cpp-2008-2-10-1
 # objects of a class often has the lowercase name of the class.
 premium-misra-cpp-2008-2-10-4
 
+# we have constants that don't have U suffix
+premium-misra-cpp-2008-2-13-3
+
 # flag |= ..
 premium-misra-cpp-2008-4-5-1
 
@@ -76,6 +82,9 @@ premium-misra-cpp-2008-5-0-11
 # conversion of char-to-int is intentional sometimes
 premium-misra-cpp-2008-5-0-12
 
+# pointer to bool conversion in condition
+premium-misra-cpp-2008-5-0-13
+
 # pointer-to-bool conversion is common
 premium-misra-cpp-2008-5-0-14
 
@@ -106,9 +115,30 @@ premium-misra-cpp-2008-5-2-12
 # we write !pointer by intention
 premium-misra-cpp-2008-5-3-1
 
+# we have side effects in && || RHS by intention
+premium-misra-cpp-2008-5-14-1
+
+# comma operator: we often declare many variables in the same line
+premium-misra-cpp-2008-5-18-1
+
+# we have quite many assignments in subexpressions. for instance in expression `tok2 = tok2->next()` it's clear a equality is not intended.
+premium-misra-cpp-2008-6-2-1
+
 # for (;;)
 premium-misra-cpp-2008-6-2-3
 
+# we don't enforce {} below for/while
+premium-misra-cpp-2008-6-3-1
+
+# we don't enforce {} below if/else
+premium-misra-cpp-2008-6-4-1
+
+# we do not enforce final "else"
+premium-misra-cpp-2008-6-4-2
+
+# we have switch with return
+premium-misra-cpp-2008-6-4-5
+
 # it's not a bug to not put default at the end of a switch body
 premium-misra-cpp-2008-6-4-6
 
@@ -131,6 +161,9 @@ premium-misra-cpp-2008-7-3-1
 # intentional: return reference from method to non-const reference parameter
 premium-misra-cpp-2008-7-5-3
 
+# we have recursion by intention
+premium-misra-cpp-2008-7-5-4
+
 # intentional declaration of multiple variables
 premium-misra-cpp-2008-8-0-1
 
@@ -143,15 +176,24 @@ premium-misra-cpp-2008-8-5-3
 # TODO Fix these
 premium-misra-cpp-2008-9-3-1
 
+# methods that return non-const handles to members
+premium-misra-cpp-2008-9-3-2
+
 # we use unions by intention sometimes
 premium-misra-cpp-2008-9-5-1
 
 # overridden methods is safe
 premium-misra-cpp-2008-10-3-1
 
+# in modern c++ it's prefered to use override/final
+premium-misra-cpp-2008-10-3-2
+
 # some classes have public members by intention
 premium-misra-cpp-2008-11-0-1
 
+# clang-tidy warns if there are redundant base class initialization [readability-redundant-member-init]
+premium-misra-cpp-2008-12-1-2
+
 # rule should not apply to deleted copy assignment operator
 premium-misra-cpp-2008-12-8-2
 
@@ -161,8 +203,13 @@ premium-misra-cpp-2008-14-6-2
 # function specializations: TODO check if we should refactor
 premium-misra-cpp-2008-14-8-2
 
+# we throw/catch token pointer in one case by intention
+premium-misra-cpp-2008-15-0-2
+premium-misra-cpp-2008-15-3-5
+
 # we use preprocessor when it makes sense
 premium-misra-cpp-2008-16-0-1
+premium-misra-cpp-2008-16-0-7
 premium-misra-cpp-2008-16-2-1
 premium-misra-cpp-2008-16-2-2
 premium-misra-cpp-2008-16-3-2

From 2e69ee9b50bd83002e30969ea32d2842ccc8fe16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 3 Feb 2024 13:30:18 +0100
Subject: [PATCH 22/29] Fix Misra C++ warnings

lib/vfvalue.cpp:118:25: style: A switch statement shall be a well-formed switch statement. [premium-misra-cpp-2008-6-4-3]
            std::string result = "symbolic=" + tokvalue->expressionString();
                        ^
lib/valueflow.cpp:141:75: style: In the definition of a function-like macro, each instance of a parameter shall be enclosed in parentheses, unless it is used as the operand of # or ##. [premium-misra-cpp-2008-16-0-6]
define bailout2(type, tokenlist, errorLogger, tok, what) bailoutInternal(type, tokenlist, errorLogger, tok, what, __FILE__, __LINE__, __func__)
                                                                          ^
lib/valueflow.cpp:143:81: style: In the definition of a function-like macro, each instance of a parameter shall be enclosed in parentheses, unless it is used as the operand of # or ##. [premium-misra-cpp-2008-16-0-6]
define bailout(tokenlist, errorLogger, tok, what) bailout2("valueFlowBailout", tokenlist, errorLogger, tok, what)
                                                                                ^
lib/valueflow.cpp:145:114: style: In the definition of a function-like macro, each instance of a parameter shall be enclosed in parentheses, unless it is used as the operand of # or ##. [premium-misra-cpp-2008-16-0-6]
define bailoutIncompleteVar(tokenlist, errorLogger, tok, what) bailoutInternal("valueFlowBailoutIncompleteVar", tokenlist, errorLogger, tok, what, "", 0, __func__)
                                                                                                                 ^
lib/valueflow.cpp:9416:270: style: In the definition of a function-like macro, each instance of a parameter shall be enclosed in parentheses, unless it is used as the operand of # or ##. [premium-misra-cpp-2008-16-0-6]
define VALUEFLOW_ADAPTOR(cpp, ...)                                                                                    \
                                                                                                                                                                                                                                                                             ^
---
 lib/valueflow.cpp | 8 ++++----
 lib/vfvalue.cpp   | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index 04db01b8f71..a32c4d35fab 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -138,11 +138,11 @@ static void bailoutInternal(const std::string& type, const TokenList &tokenlist,
     errorLogger->reportErr(errmsg);
 }
 
-#define bailout2(type, tokenlist, errorLogger, tok, what) bailoutInternal(type, tokenlist, errorLogger, tok, what, __FILE__, __LINE__, __func__)
+#define bailout2(type, tokenlist, errorLogger, tok, what) bailoutInternal((type), (tokenlist), (errorLogger), (tok), (what), __FILE__, __LINE__, __func__)
 
-#define bailout(tokenlist, errorLogger, tok, what) bailout2("valueFlowBailout", tokenlist, errorLogger, tok, what)
+#define bailout(tokenlist, errorLogger, tok, what) bailout2("valueFlowBailout", (tokenlist), (errorLogger), (tok), (what))
 
-#define bailoutIncompleteVar(tokenlist, errorLogger, tok, what) bailoutInternal("valueFlowBailoutIncompleteVar", tokenlist, errorLogger, tok, what, "", 0, __func__)
+#define bailoutIncompleteVar(tokenlist, errorLogger, tok, what) bailoutInternal("valueFlowBailoutIncompleteVar", (tokenlist), (errorLogger), (tok), (what), "", 0, __func__)
 
 static std::string debugString(const ValueFlow::Value& v)
 {
@@ -9415,7 +9415,7 @@ static ValueFlowPassAdaptor<F> makeValueFlowPassAdaptor(const char* name, bool c
 
 #define VALUEFLOW_ADAPTOR(cpp, ...)                                                                                    \
     makeValueFlowPassAdaptor(#__VA_ARGS__,                                                                             \
-                             cpp,                                                                                      \
+                             (cpp),                                                                                      \
                              [](TokenList& tokenlist,                                                                  \
                                 SymbolDatabase& symboldatabase,                                                        \
                                 ErrorLogger* errorLogger,                                                              \
diff --git a/lib/vfvalue.cpp b/lib/vfvalue.cpp
index b07a2c57304..44155c0eccf 100644
--- a/lib/vfvalue.cpp
+++ b/lib/vfvalue.cpp
@@ -115,6 +115,7 @@ namespace ValueFlow {
         case ValueType::LIFETIME:
             return "lifetime=" + tokvalue->str();
         case ValueType::SYMBOLIC:
+        {
             std::string result = "symbolic=" + tokvalue->expressionString();
             if (intvalue > 0)
                 result += "+" + std::to_string(intvalue);
@@ -122,6 +123,7 @@ namespace ValueFlow {
                 result += "-" + std::to_string(-intvalue);
             return result;
         }
+        }
         throw InternalError(nullptr, "Invalid ValueFlow Value type");
     }
 

From 79b380efe0011002be7a8a37dbcac040f00ef024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20St=C3=B6neberg?=
 <firewave@users.noreply.github.com>
Date: Sun, 28 Jan 2024 19:04:47 +0100
Subject: [PATCH 23/29] CI-unixish-docker.yml: fixate
 `hendrikmuhs/ccache-action` on `1.2.11` to fix older images (#5918)

See

https://github.com/danmar/cppcheck/actions/runs/7677304162/job/20926809147?pr=5917
https://github.com/hendrikmuhs/ccache-action/issues/178
---
 .github/workflows/CI-unixish-docker.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/CI-unixish-docker.yml b/.github/workflows/CI-unixish-docker.yml
index c5e51d5b4c0..8e54e5dce28 100644
--- a/.github/workflows/CI-unixish-docker.yml
+++ b/.github/workflows/CI-unixish-docker.yml
@@ -60,8 +60,10 @@ jobs:
       # needs to be called after the package installation since
       # - it doesn't call "apt-get update"
       # - it doesn't support centos
+      #
+      # needs to be to fixated on 1.2.11 so it works with older images - see https://github.com/hendrikmuhs/ccache-action/issues/178
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.11
         if: matrix.image != 'ubuntu:14.04' # no support for --set-config
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
@@ -134,8 +136,10 @@ jobs:
       # needs to be called after the package installation since
       # - it doesn't call "apt-get update"
       # - it doesn't support centos
+      #
+      # needs to be to fixated on 1.2.11 so it works with older images - see https://github.com/hendrikmuhs/ccache-action/issues/178
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.11
         if: matrix.image != 'ubuntu:14.04' # no support for --set-config
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}

From a2e534923eb3ed23cea1414ef8b9768c8f1c212a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 3 Feb 2024 21:53:23 +0100
Subject: [PATCH 24/29] Extend #12344 (cmdline: also allow cert-cpp-2016,
 misra-cpp-2008 and misra-cpp-2023) (#5942)

---
 cli/cmdlineparser.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 39dea95f80c..8a084371d7d 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -893,10 +893,13 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                     "autosar",
                     "cert-c-2016",
                     "cert-c++-2016",
+                    "cert-cpp-2016",
                     "misra-c-2012",
                     "misra-c-2023",
                     "misra-c++-2008",
+                    "misra-cpp-2008",
                     "misra-c++-2023",
+                    "misra-cpp-2023",
                     "bughunting",
                     "safety"};
 

From 1850bc9d9939a775e41335ada9596352d2693424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 3 Feb 2024 21:57:54 +0100
Subject: [PATCH 25/29] 2.13.3: Set versions

---
 cmake/versions.cmake          | 2 +-
 lib/version.h                 | 2 +-
 win_installer/productInfo.wxi | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/versions.cmake b/cmake/versions.cmake
index 2aebb671235..4bc0dcb167c 100644
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@@ -1,6 +1,6 @@
 # Version for libraries CPP
 # Version string must have 3 "parts". https://sourceforge.net/p/cppcheck/discussion/development/thread/e57efb2b62/
-SET(VERSION "2.13.2")
+SET(VERSION "2.13.3")
 STRING(REGEX MATCHALL "[0-9]+" VERSION_PARTS "${VERSION}")
 LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
 LIST(GET VERSION_PARTS 1 VERSION_MINOR)
diff --git a/lib/version.h b/lib/version.h
index eef92ee11b4..6dbc157714f 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -7,7 +7,7 @@
 #define CPPCHECK_MAJOR_VERSION 2
 #define CPPCHECK_MINOR_VERSION 13
 #define CPPCHECK_DEVMINOR_VERSION 13
-#define CPPCHECK_FIX_VERSION 2
+#define CPPCHECK_FIX_VERSION 3
 
 #define STRINGIFY(x) STRING(x)
 #define STRING(VER) #VER
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index 41f9f861a27..b5022774645 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define ProductName = "Cppcheck $(var.Platform) 2.13.2" ?>
+  <?define ProductName = "Cppcheck $(var.Platform) 2.13.3" ?>
   <?define ProductNameShort = "Cppcheck" ?>
-  <?define ProductVersion = "2.13.2" ?>
+  <?define ProductVersion = "2.13.3" ?>
 
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>

From 4f7050c077bcf3fc48a63d71f861ea651d179f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 10 Feb 2024 16:11:19 +0100
Subject: [PATCH 26/29] Fix #12427 (premium misra C rule texts) (#5969)

---
 addons/misra.py          |  8 --------
 cli/cppcheckexecutor.cpp |  2 ++
 gui/checkthread.cpp      |  2 +-
 gui/checkthread.h        |  2 ++
 gui/mainwindow.cpp       |  2 ++
 lib/cppcheck.cpp         |  3 +--
 lib/cppcheck.h           |  2 ++
 lib/settings.cpp         | 44 ++++++++++++++++++++++++++++++++++++++++
 lib/settings.h           |  7 +++++++
 test/testsettings.cpp    |  9 ++++++++
 10 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/addons/misra.py b/addons/misra.py
index aa2ab14e0a9..2208d9dc30e 100755
--- a/addons/misra.py
+++ b/addons/misra.py
@@ -4281,14 +4281,6 @@ def reportError(self, location, num1, num2):
             errorId = 'c2012-' + str(num1) + '.' + str(num2)
             misra_severity = 'Undefined'
             cppcheck_severity = 'style'
-            if self.path_premium_addon and ruleNum not in self.ruleTexts:
-                for line in cppcheckdata.cmd_output([self.path_premium_addon, '--cli', '--get-rule-text=' + errorId]).split('\n'):
-                    if len(line) > 1 and not line.startswith('{'):
-                        errmsg = line.strip()
-                        rule = Rule(num1, num2)
-                        rule.text = errmsg
-                        self.ruleTexts[rule.num] = rule
-                        break
             if ruleNum in self.ruleTexts:
                 errmsg = self.ruleTexts[ruleNum].text
                 if self.ruleTexts[ruleNum].misra_severity:
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
index 0340d7277e0..9735fe7e1f9 100644
--- a/cli/cppcheckexecutor.cpp
+++ b/cli/cppcheckexecutor.cpp
@@ -193,6 +193,8 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
     mFiles = parser.getFiles();
     mFileSettings = parser.getFileSettings();
 
+    settings.setMisraRuleTexts(executeCommand);
+
     mStdLogger = new StdLogger(settings);
 
     CppCheck cppCheck(*mStdLogger, true, executeCommand);
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
index e7d682ba0ef..e3667b52d8f 100644
--- a/gui/checkthread.cpp
+++ b/gui/checkthread.cpp
@@ -57,7 +57,7 @@
 #endif
 
 // NOLINTNEXTLINE(performance-unnecessary-value-param) - used as callback so we need to preserve the signature
-static int executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output) // cppcheck-suppress passedByValueCallback
+int CheckThread::executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output) // cppcheck-suppress passedByValue
 {
     output.clear();
 
diff --git a/gui/checkthread.h b/gui/checkthread.h
index 8dd3f8a80ce..f12089d330d 100644
--- a/gui/checkthread.h
+++ b/gui/checkthread.h
@@ -92,6 +92,8 @@ class CheckThread : public QThread {
      */
     static QString clangTidyCmd();
 
+    static int executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output);
+
 signals:
 
     /**
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 97385d456a6..9f6e9d510c5 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -22,6 +22,7 @@
 #include "applicationlist.h"
 #include "aboutdialog.h"
 #include "analyzerinfo.h"
+#include "checkthread.h"
 #include "common.h"
 #include "cppcheck.h"
 #include "errortypes.h"
@@ -1087,6 +1088,7 @@ QPair<bool,Settings> MainWindow::getCppcheckSettings()
             if (!premiumArgs.contains("misra") && mProjectFile->getAddons().contains("misra"))
                 premiumArgs += " --misra-c-2012";
             result.premiumArgs = premiumArgs.mid(1).toStdString();
+            result.setMisraRuleTexts(CheckThread::executeCommand);
         }
     }
 
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 4b8807121f9..b74d93dbed2 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -1456,8 +1456,7 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
             errmsg.id = obj["addon"].get<std::string>() + "-" + obj["errorId"].get<std::string>();
             if (misraC2023 && startsWith(errmsg.id, "misra-c2012-"))
                 errmsg.id = "misra-c2023-" + errmsg.id.substr(12);
-            const std::string text = obj["message"].get<std::string>();
-            errmsg.setmsg(text);
+            errmsg.setmsg(mSettings.getMisraRuleText(errmsg.id, obj["message"].get<std::string>()));
             const std::string severity = obj["severity"].get<std::string>();
             errmsg.severity = severityFromString(severity);
             if (errmsg.severity == Severity::none || errmsg.severity == Severity::internal) {
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
index f394330e29b..77003e98eff 100644
--- a/lib/cppcheck.h
+++ b/lib/cppcheck.h
@@ -152,6 +152,8 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
 
     bool isPremiumCodingStandardId(const std::string& id) const;
 
+    std::string getAddonMessage(const std::string& id, const std::string& text) const;
+
 private:
 #ifdef HAVE_RULES
     /** Are there "simple" rules */
diff --git a/lib/settings.cpp b/lib/settings.cpp
index 451747d4c99..9b18f72cdb4 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -22,6 +22,7 @@
 #include "vfvalue.h"
 
 #include <fstream>
+#include <sstream>
 
 #include "json.h"
 
@@ -521,3 +522,46 @@ bool Settings::isPremiumEnabled(const char id[]) const
         return true;
     return false;
 }
+
+void Settings::setMisraRuleTexts(const ExecuteCmdFn& executeCommand)
+{
+    if (premiumArgs.find("--misra-c-20") != std::string::npos) {
+        const auto it = std::find_if(addonInfos.cbegin(), addonInfos.cend(), [](const AddonInfo& a) {
+            return a.name == "premiumaddon.json";
+        });
+        if (it != addonInfos.cend()) {
+            std::string arg;
+            if (premiumArgs.find("--misra-c-2023") != std::string::npos)
+                arg = "--misra-c-2023-rule-texts";
+            else
+                arg = "--misra-c-2012-rule-texts";
+            std::string output;
+            executeCommand(it->executable, {arg}, "2>&1", output);
+            setMisraRuleTexts(output);
+        }
+    }
+}
+
+void Settings::setMisraRuleTexts(const std::string& data)
+{
+    mMisraRuleTexts.clear();
+    std::istringstream istr(data);
+    std::string line;
+    while (std::getline(istr, line)) {
+        std::string::size_type pos = line.find(' ');
+        if (pos == std::string::npos)
+            continue;
+        std::string id = line.substr(0, pos);
+        std::string text = line.substr(pos + 1);
+        if (id.empty() || text.empty())
+            continue;
+        mMisraRuleTexts[id] = text;
+    }
+}
+
+std::string Settings::getMisraRuleText(const std::string& id, const std::string& text) const {
+    if (id.compare(0, 9, "misra-c20") != 0)
+        return text;
+    const auto it = mMisraRuleTexts.find(id.substr(id.rfind('-') + 1));
+    return it != mMisraRuleTexts.end() ? it->second : text;
+}
diff --git a/lib/settings.h b/lib/settings.h
index ec7bb728acf..a1692d8ae64 100644
--- a/lib/settings.h
+++ b/lib/settings.h
@@ -263,6 +263,7 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief Extra arguments for Cppcheck Premium addon */
     std::string premiumArgs;
 
+    /** Is checker id enabled by premiumArgs */
     bool isPremiumEnabled(const char id[]) const;
 
     /** @brief Using -E for debugging purposes */
@@ -448,9 +449,15 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     void setCheckLevelExhaustive();
     void setCheckLevelNormal();
 
+    using ExecuteCmdFn = std::function<int (std::string,std::vector<std::string>,std::string,std::string&)>;
+    void setMisraRuleTexts(const ExecuteCmdFn& executeCommand);
+    void setMisraRuleTexts(const std::string& data);
+    std::string getMisraRuleText(const std::string& id, const std::string& text) const;
+
 private:
     static std::string parseEnabled(const std::string &str, std::tuple<SimpleEnableGroup<Severity>, SimpleEnableGroup<Checks>> &groups);
     std::string applyEnabled(const std::string &str, bool enable);
+    std::map<std::string, std::string> mMisraRuleTexts;
 };
 
 /// @}
diff --git a/test/testsettings.cpp b/test/testsettings.cpp
index 6c2b2de2d7c..8f4027044df 100644
--- a/test/testsettings.cpp
+++ b/test/testsettings.cpp
@@ -31,6 +31,7 @@ class TestSettings : public TestFixture {
         TEST_CASE(simpleEnableGroup);
         TEST_CASE(loadCppcheckCfg);
         TEST_CASE(loadCppcheckCfgSafety);
+        TEST_CASE(ruleTexts);
     }
 
     void simpleEnableGroup() const {
@@ -238,6 +239,14 @@ class TestSettings : public TestFixture {
             ASSERT_EQUALS(true, s.safety);
         }
     }
+
+    void ruleTexts() const
+    {
+        Settings s;
+        s.setMisraRuleTexts("1.1 text 1\n1.2 text 2\n");
+        ASSERT_EQUALS("text 1", s.getMisraRuleText("misra-c2012-1.1", "---"));
+        ASSERT_EQUALS("text 2", s.getMisraRuleText("misra-c2012-1.2", "---"));
+    }
 };
 
 REGISTER_TEST(TestSettings)

From 1e9841b2aadbbff74c441617ba12cef275e5b7b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Thu, 15 Feb 2024 14:29:14 +0100
Subject: [PATCH 27/29] run tools/get_checkers.py

---
 lib/checkers.cpp | 150 ++++++++++++++++++++++++-----------------------
 1 file changed, 76 insertions(+), 74 deletions(-)

diff --git a/lib/checkers.cpp b/lib/checkers.cpp
index 94d2904fe95..f668665cfdf 100644
--- a/lib/checkers.cpp
+++ b/lib/checkers.cpp
@@ -64,6 +64,7 @@ namespace checkers {
         {"CheckStl::checkDereferenceInvalidIterator2",""},
         {"CheckStl::useStlAlgorithm","style"},
         {"CheckStl::knownEmptyContainer","style"},
+        {"CheckStl::eraseIteratorOutOfBounds",""},
         {"CheckStl::checkMutexes","warning"},
         {"CheckBoost::checkBoostForeachModification",""},
         {"CheckNullPointer::nullPointer",""},
@@ -324,84 +325,84 @@ namespace checkers {
         {"Cert C++: OOP58-CPP","style"},
         {"Cert C++: STR50-CPP",""},
         {"Cert C++: STR53-CPP",""},
-        {"Cert C: ARR30-C","warning"},
-        {"Cert C: ARR32-C","warning"},
-        {"Cert C: ARR37-C","warning"},
+        {"Cert C: ARR30-C",""},
+        {"Cert C: ARR32-C",""},
+        {"Cert C: ARR37-C",""},
         {"Cert C: ARR38-C",""},
-        {"Cert C: ARR39-C","warning"},
-        {"Cert C: CON30-C","style"},
-        {"Cert C: CON31-C","style"},
-        {"Cert C: CON32-C","style"},
-        {"Cert C: CON33-C","style"},
-        {"Cert C: CON34-C","warning"},
-        {"Cert C: CON35-C","warning"},
-        {"Cert C: CON36-C","style"},
-        {"Cert C: CON37-C","style"},
-        {"Cert C: CON38-C","warning"},
-        {"Cert C: CON39-C","warning"},
-        {"Cert C: CON40-C","warning"},
-        {"Cert C: CON41-C","style"},
-        {"Cert C: DCL31-C","style"},
-        {"Cert C: DCL36-C","style"},
-        {"Cert C: DCL37-C","style"},
-        {"Cert C: DCL38-C","style"},
-        {"Cert C: DCL39-C","style"},
-        {"Cert C: DCL40-C","style"},
-        {"Cert C: DCL41-C","style"},
-        {"Cert C: ENV30-C","style"},
-        {"Cert C: ENV31-C","style"},
-        {"Cert C: ENV32-C","style"},
-        {"Cert C: ENV33-C","style"},
-        {"Cert C: ENV34-C","style"},
-        {"Cert C: ERR30-C","warning"},
-        {"Cert C: ERR32-C","warning"},
-        {"Cert C: ERR33-C","warning"},
-        {"Cert C: EXP32-C","warning"},
+        {"Cert C: ARR39-C",""},
+        {"Cert C: CON30-C",""},
+        {"Cert C: CON31-C",""},
+        {"Cert C: CON32-C",""},
+        {"Cert C: CON33-C",""},
+        {"Cert C: CON34-C",""},
+        {"Cert C: CON35-C",""},
+        {"Cert C: CON36-C",""},
+        {"Cert C: CON37-C",""},
+        {"Cert C: CON38-C",""},
+        {"Cert C: CON39-C",""},
+        {"Cert C: CON40-C",""},
+        {"Cert C: CON41-C",""},
+        {"Cert C: DCL31-C",""},
+        {"Cert C: DCL36-C",""},
+        {"Cert C: DCL37-C",""},
+        {"Cert C: DCL38-C",""},
+        {"Cert C: DCL39-C",""},
+        {"Cert C: DCL40-C",""},
+        {"Cert C: DCL41-C",""},
+        {"Cert C: ENV30-C",""},
+        {"Cert C: ENV31-C",""},
+        {"Cert C: ENV32-C",""},
+        {"Cert C: ENV33-C",""},
+        {"Cert C: ENV34-C",""},
+        {"Cert C: ERR30-C",""},
+        {"Cert C: ERR32-C",""},
+        {"Cert C: ERR33-C",""},
+        {"Cert C: EXP32-C",""},
         {"Cert C: EXP35-C",""},
-        {"Cert C: EXP36-C","style"},
-        {"Cert C: EXP37-C","style"},
-        {"Cert C: EXP39-C","style"},
-        {"Cert C: EXP40-C","style"},
-        {"Cert C: EXP42-C","style"},
-        {"Cert C: EXP43-C","style"},
-        {"Cert C: EXP45-C","warning"},
-        {"Cert C: FIO30-C","warning"},
-        {"Cert C: FIO32-C","style"},
-        {"Cert C: FIO34-C","style"},
+        {"Cert C: EXP36-C",""},
+        {"Cert C: EXP37-C",""},
+        {"Cert C: EXP39-C",""},
+        {"Cert C: EXP40-C",""},
+        {"Cert C: EXP42-C",""},
+        {"Cert C: EXP43-C",""},
+        {"Cert C: EXP45-C",""},
+        {"Cert C: FIO30-C",""},
+        {"Cert C: FIO32-C",""},
+        {"Cert C: FIO34-C",""},
         {"Cert C: FIO37-C",""},
-        {"Cert C: FIO38-C","style"},
-        {"Cert C: FIO40-C","style"},
-        {"Cert C: FIO41-C","style"},
-        {"Cert C: FIO44-C","warning"},
-        {"Cert C: FIO45-C","warning"},
-        {"Cert C: FLP30-C","warning"},
+        {"Cert C: FIO38-C",""},
+        {"Cert C: FIO40-C",""},
+        {"Cert C: FIO41-C",""},
+        {"Cert C: FIO44-C",""},
+        {"Cert C: FIO45-C",""},
+        {"Cert C: FLP30-C",""},
         {"Cert C: FLP36-C","portability"},
-        {"Cert C: FLP37-C","style"},
-        {"Cert C: INT30-C","warning"},
-        {"Cert C: INT31-C","warning"},
-        {"Cert C: INT32-C","warning"},
-        {"Cert C: INT33-C","warning"},
-        {"Cert C: INT34-C","warning"},
-        {"Cert C: INT35-C","warning"},
-        {"Cert C: INT36-C","warning"},
-        {"Cert C: MEM33-C","style"},
-        {"Cert C: MEM35-C","warning"},
-        {"Cert C: MEM36-C","warning"},
-        {"Cert C: MSC30-C","style"},
-        {"Cert C: MSC32-C","style"},
-        {"Cert C: MSC33-C","style"},
-        {"Cert C: MSC38-C","warning"},
-        {"Cert C: MSC39-C","warning"},
-        {"Cert C: MSC40-C","warning"},
-        {"Cert C: PRE31-C","style"},
-        {"Cert C: SIG30-C","style"},
-        {"Cert C: SIG31-C","warning"},
-        {"Cert C: SIG34-C","style"},
-        {"Cert C: SIG35-C","warning"},
-        {"Cert C: STR31-C","warning"},
-        {"Cert C: STR32-C","warning"},
-        {"Cert C: STR34-C","warning"},
-        {"Cert C: STR38-C","style"},
+        {"Cert C: FLP37-C",""},
+        {"Cert C: INT30-C",""},
+        {"Cert C: INT31-C",""},
+        {"Cert C: INT32-C",""},
+        {"Cert C: INT33-C",""},
+        {"Cert C: INT34-C",""},
+        {"Cert C: INT35-C",""},
+        {"Cert C: INT36-C",""},
+        {"Cert C: MEM33-C",""},
+        {"Cert C: MEM35-C",""},
+        {"Cert C: MEM36-C",""},
+        {"Cert C: MSC30-C",""},
+        {"Cert C: MSC32-C",""},
+        {"Cert C: MSC33-C",""},
+        {"Cert C: MSC38-C",""},
+        {"Cert C: MSC39-C",""},
+        {"Cert C: MSC40-C",""},
+        {"Cert C: PRE31-C",""},
+        {"Cert C: SIG30-C",""},
+        {"Cert C: SIG31-C",""},
+        {"Cert C: SIG34-C",""},
+        {"Cert C: SIG35-C",""},
+        {"Cert C: STR31-C",""},
+        {"Cert C: STR32-C",""},
+        {"Cert C: STR34-C",""},
+        {"Cert C: STR38-C",""},
         {"Misra C++ 2023: 21.20.1",""},
         {"Misra C++ 2023: 21.20.2",""},
         {"Misra C++ 2023: 6.7.1",""},
@@ -613,6 +614,7 @@ namespace checkers {
         {"Misra C: 21.1","style"},
         {"Misra C: 21.12","style"},
         {"Misra C: 21.16","style"},
+        {"Misra C: 21.2","style"},
         {"Misra C: 21.22","style"},
         {"Misra C: 21.23","style"},
         {"Misra C: 21.24","style"},

From 83de9ef40c65104276024aef93d32bb764cc1af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Thu, 15 Feb 2024 14:37:36 +0100
Subject: [PATCH 28/29] 2.13.4: Set versions

---
 cmake/versions.cmake          | 2 +-
 lib/version.h                 | 2 +-
 win_installer/productInfo.wxi | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/versions.cmake b/cmake/versions.cmake
index 4bc0dcb167c..11a6ec86d38 100644
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@@ -1,6 +1,6 @@
 # Version for libraries CPP
 # Version string must have 3 "parts". https://sourceforge.net/p/cppcheck/discussion/development/thread/e57efb2b62/
-SET(VERSION "2.13.3")
+SET(VERSION "2.13.4")
 STRING(REGEX MATCHALL "[0-9]+" VERSION_PARTS "${VERSION}")
 LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
 LIST(GET VERSION_PARTS 1 VERSION_MINOR)
diff --git a/lib/version.h b/lib/version.h
index 6dbc157714f..d104cba18eb 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -7,7 +7,7 @@
 #define CPPCHECK_MAJOR_VERSION 2
 #define CPPCHECK_MINOR_VERSION 13
 #define CPPCHECK_DEVMINOR_VERSION 13
-#define CPPCHECK_FIX_VERSION 3
+#define CPPCHECK_FIX_VERSION 4
 
 #define STRINGIFY(x) STRING(x)
 #define STRING(VER) #VER
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index b5022774645..6508f4936fc 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -2,7 +2,7 @@
 <Include>
   <?define ProductName = "Cppcheck $(var.Platform) 2.13.3" ?>
   <?define ProductNameShort = "Cppcheck" ?>
-  <?define ProductVersion = "2.13.3" ?>
+  <?define ProductVersion = "2.13.4" ?>
 
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>

From e9c4d5b3d1a60dc6f55dc5eeea6959d2efafd36f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Thu, 15 Feb 2024 14:38:46 +0100
Subject: [PATCH 29/29] 2.13.4: Update releasenotes.txt

---
 releasenotes.txt | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/releasenotes.txt b/releasenotes.txt
index 921972cf8fa..a8e292f746a 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,8 +1,4 @@
-Release Notes for Cppcheck 2.13.1
+Release Notes for Cppcheck 2.13.4
 
 Usability:
- * #12342: Show premium autosar/misra/cert style issues even if --enable is not used
- * #12344: Better validation of --premium options
-
-Safety critical:
- * #12341: If --premium=safety is used then go to "safety mode". Do not override this in cppcheck.cfg
+ * #12427: Speedup premium misra checking