cppcheck-opensource · fu7mu4 · Aug 31, 2024 · Aug 31, 2024 · Aug 31, 2024 · Aug 31, 2024
diff --git a/.github/workflows/CI-cygwin.yml b/.github/workflows/CI-cygwin.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/CI-mingw.yml b/.github/workflows/CI-mingw.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/CI-unixish-docker.yml b/.github/workflows/CI-unixish-docker.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/buildman.yml b/.github/workflows/buildman.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/cppcheck-premium.yml b/.github/workflows/cppcheck-premium.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:
@@ -21,18 +22,19 @@ permissions:
 jobs:
 
   build:
-    runs-on: ubuntu-22.04 # run on the latest image only
+    runs-on: ubuntu-24.04 # run on the latest image only
     steps:
       - uses: actions/checkout@v4
 
       - name: Download cppcheckpremium
         run: |
           premium_version=${{ inputs.premium_version }}
           if [ -z $premium_version ]; then
-            premium_version=devdrop-20240815
-            wget https://files.cppchecksolutions.com/devdrop/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
+            premium_version=24.9.0.1
+            #wget https://files.cppchecksolutions.com/devdrop/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
+            wget https://files.cppchecksolutions.com/$premium_version/ubuntu-24.04/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
           else
-            wget https://files.cppchecksolutions.com/$premium_version/ubuntu-22.04/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
+            wget https://files.cppchecksolutions.com/$premium_version/ubuntu-24.04/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
           fi
           tar xvzf cppcheckpremium.tar.gz
           mv cppcheckpremium-$premium_version cppcheckpremium

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/scriptcheck.yml b/.github/workflows/scriptcheck.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/selfcheck.yml b/.github/workflows/selfcheck.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
@@ -7,6 +7,7 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:

diff --git a/AUTHORS b/AUTHORS
@@ -74,6 +74,7 @@ Carl Morgan
 Carlo Marcelo Arenas Belón
 Carlos Gomes Martinho
 Carl-Oskar Larsson
+Cary Converse
 Cary R
 Changkyoon Kim
 Chris Lalancette

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 if(MSVC)
     cmake_minimum_required(VERSION 3.13)
 endif()
-project(Cppcheck VERSION 2.14.99 LANGUAGES CXX)
+project(Cppcheck VERSION 2.15.99 LANGUAGES CXX)
 
 include(cmake/cxx11.cmake)
 use_cxx11()

diff --git a/cfg/protobuf.cfg b/cfg/protobuf.cfg
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<def format="2">
+  <define name="PROTOBUF_VERSION" value="9999999"/>
+  <define name="PROTOBUF_MIN_PROTOC_VERSION" value="0"/>
+  <define name="PROTOBUF_NAMESPACE_OPEN" value=""/>
+  <define name="PROTOBUF_NAMESPACE_CLOSE" value=""/>
+  <define name="PROTOBUF_SECTION_VARIABLE(SECTION)" value=""/>
+  <define name="GOOGLE_PROTOBUF_RUNTIME_DEPRECATED(MSG)" value=""/>
+</def>
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -164,8 +164,8 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
 
     // Check that all include paths exist
     {
-        for (std::list<std::string>::iterator iter = mSettings.includePaths.begin();
-             iter != mSettings.includePaths.end();
+        for (std::list<std::string>::const_iterator iter = mSettings.includePaths.cbegin();
+             iter != mSettings.includePaths.cend();
              ) {
             const std::string path(Path::toNativeSeparators(*iter));
             if (Path::isDirectory(path))

diff --git a/cli/main.cpp b/cli/main.cpp
@@ -20,7 +20,7 @@
 /**
  *
  * @mainpage Cppcheck
- * @version 2.14.99
+ * @version 2.15.99
  *
  * @section overview_sec Overview
  * Cppcheck is a simple tool for static analysis of C/C++ code.

diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
@@ -318,18 +318,18 @@ unsigned int ProcessExecutor::check()
             const int r = select(*std::max_element(rpipes.cbegin(), rpipes.cend()) + 1, &rfds, nullptr, nullptr, &tv);
 
             if (r > 0) {
-                std::list<int>::iterator rp = rpipes.begin();
-                while (rp != rpipes.end()) {
+                std::list<int>::const_iterator rp = rpipes.cbegin();
+                while (rp != rpipes.cend()) {
                     if (FD_ISSET(*rp, &rfds)) {
                         std::string name;
-                        const std::map<int, std::string>::iterator p = pipeFile.find(*rp);
-                        if (p != pipeFile.end()) {
+                        const std::map<int, std::string>::const_iterator p = pipeFile.find(*rp);
+                        if (p != pipeFile.cend()) {
                             name = p->second;
                         }
                         const bool readRes = handleRead(*rp, result, name);
                         if (!readRes) {
                             std::size_t size = 0;
-                            if (p != pipeFile.end()) {
+                            if (p != pipeFile.cend()) {
                                 pipeFile.erase(p);
                                 const auto fs = std::find_if(mFiles.cbegin(), mFiles.cend(), [&name](const FileWithDetails& entry) {
                                     return entry.path() == name;
@@ -358,8 +358,8 @@ unsigned int ProcessExecutor::check()
             const pid_t child = waitpid(0, &stat, WNOHANG);
             if (child > 0) {
                 std::string childname;
-                const std::map<pid_t, std::string>::iterator c = childFile.find(child);
-                if (c != childFile.end()) {
+                const std::map<pid_t, std::string>::const_iterator c = childFile.find(child);
+                if (c != childFile.cend()) {
                     childname = c->second;
                     childFile.erase(c);
                 }

diff --git a/createrelease b/createrelease
@@ -5,6 +5,8 @@
 # Create release candidate
 # ========================
 #
+# update cppcheck used in premium addon CI
+#
 # check every isPremiumEnabled call:
 # - every id should be in --errorlist
 #   git grep 'isPremiumEnabled[(]"' | sed 's/.*isPremiumEnabled[(]"//' | sed 's/".*//' | sort | uniq > ids1.txt
@@ -20,7 +22,7 @@
 #
 # self check, fix critical issues:
 # make clean && make CXXFLAGS=-O2 MATCHCOMPILER=yes -j4
-# ./cppcheck -D__CPPCHECK__ -D__GNUC__ -DCHECK_INTERNAL -DHAVE_RULES --std=c++11 --library=cppcheck-lib --library=qt --enable=style --inconclusive --inline-suppr --suppress=bitwiseOnBoolean --suppress=shadowFunction --suppress=useStlAlgorithm --suppress=*:externals/picojson.h --suppress=functionConst --suppress=functionStatic --xml cli gui/*.cpp lib 2> selfcheck.xml
+# ./cppcheck -D__CPPCHECK__ -D__GNUC__ -DCHECK_INTERNAL -DHAVE_RULES --std=c++11 --library=cppcheck-lib --library=qt --enable=style --inconclusive --inline-suppr --suppress=bitwiseOnBoolean --suppress=shadowFunction --suppress=useStlAlgorithm --suppress=*:externals/picojson.h --suppress=functionConst --suppress=functionStatic --suppress=normalCheckLevelMaxBranches --xml cli gui/*.cpp lib 2> selfcheck.xml
 #
 # Generate lib/checkers.cpp (TODO the premium checkers should not be statically coded)
 # cd ~/cppchecksolutions/cppcheck && python3 tools/get_checkers.py > lib/checkers.cpp
@@ -47,7 +49,7 @@
 #
 # Update version numbers in:
 # sed -i -r "s/version 2[.][0-9]+([.]99)*/version 2.13.0/" cli/main.cpp
-# sed -i -r "s|2[.][0-9]+([.]99)*|2.13.0|" cmake/versions.cmake # version must have 3 parts.
+# sed -i -r "s|VERSION 2[.][0-9]+[.]99|VERSION 2.13.0|" CMakeLists.txt # version must have 3 parts.
 # sed -i -r "s/CPPCHECK_MINOR_VERSION [0-9]+/CPPCHECK_MINOR_VERSION 13/" lib/version.h
 # sed -i -r "s/2[.][0-9]+([.]99)*( dev)*/2.13.0/" win_installer/productInfo.wxi
 # sed -i -r "s/subtitle: Version 2\.[0-9]+.*/subtitle: Version 2.13/" man/*.md
@@ -87,8 +89,7 @@
 # Update download link on index.php main page
 #
 # Write Changelog
-# git log 2.11..2.12 > Changelog
-# <edit>
+# git log 2.11.0..2.12.0 > Changelog
 #
 # Trac:
 # 1. Create ticket "2.12 safety cosmetic changes"
@@ -110,9 +111,10 @@
 #
 # Backup:
 # * trac: cd /var && nice tar -cJf trac.tar.xz trac-cppcheck
+# * daca: cd /var && nice tar -cJf daca.tar.xz daca@home
 # * git: git checkout -f && git checkout main && git pull && tar -cJf git.tar.xz .git
 # * Changelog
-# * ci status: screenshot(s) showing that all tests pass for tagged commit
+# * mkdir out && python3 ~/cppchecksolutions/getWorkflowAndIssueLogs.py -r danmar/cppcheck -t 2.15.0 -p out
 
 # Folder/tag to use
 folder=$1
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ on: @@
         branches:
           - 'main'
           - 'releases/**'
+          - '2.*'
         tags:
           - '2.*'
       pull_request:
@@ Expand Down @@