Merge branch 'main' into chr_15021

Author: web-flow

.github/workflows/claude-review.yml

@@ -0,0 +1,53 @@
+# Automated code review of pull requests using Claude
+#
+# A member/owner/collaborator requests a review by writing a PR comment
+# containing "@claude review".
+#
+# pull_request_target is not used because the Claude GitHub App token exchange
+# rejects OIDC tokens from that event (401 "Invalid OIDC token").
+#
+# issue_comment runs the workflow file from the default branch with access to
+# secrets. The PR code is never checked out or executed.
+name: claude-review
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  review:
+    if: |
+      github.event.issue.pull_request &&
+      contains(github.event.comment.body, '@claude review') &&
+      contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.comment.author_association)
+
+    runs-on: ubuntu-24.04
+
+    permissions:
+      contents: read
+      pull-requests: write
+      id-token: write
+
+    steps:
+    # checks out the base branch, not the PR head
+    - uses: actions/checkout@v7
+      with:
+        fetch-depth: 1
+
+    - name: Claude review
+      uses: anthropics/claude-code-action@v1
+      with:
+        anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+        prompt: |
+          REPO: ${{ github.repository }}
+          PR NUMBER: ${{ github.event.issue.number }}
+
+          Review this pull request. Focus on correctness bugs, potential
+          false positives/false negatives in checkers, performance problems
+          and missing tests. Be concise and only report real issues.
+
+          Use `gh pr diff` to see the changes. Post specific issues as inline
+          comments with `mcp__github_inline_comment__create_inline_comment`
+          and post a short overall summary with `gh pr comment`.
+        claude_args: |
+          --allowedTools "mcp__github_inline_comment__create_inline_comment,Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*)"

.github/workflows/cppcheck-premium.yml

@@ -33,9 +33,9 @@ jobs:
         run: |
           premium_version=${{ inputs.premium_version }}
           if [ -z $premium_version ]; then
-            premium_version=26.3.0
+            premium_version=26.9.0
             #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
+            wget https://files.cppchecksolutions.com/release/2026/$premium_version/ubuntu-24.04/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
           else
             wget https://files.cppchecksolutions.com/$premium_version/ubuntu-24.04/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
           fi
@@ -44,16 +44,18 @@ jobs:
 
       - name: Generate a license file
         run: |
-          echo cppcheck > cppcheck.lic
-          echo 261231 >> cppcheck.lic
-          echo 80000 >> cppcheck.lic
-          echo 4b64673f03fb6230 >> cppcheck.lic
-          echo path:lib >> cppcheck.lic
+          echo 1 > cppcheck-premium-git.lic
+          echo 271231 >> cppcheck-premium-git.lic
+          echo 70c84e8412a64e58 >> cppcheck-premium-git.lic
+          echo fbb65b6bd40de73b >> cppcheck-premium-git.lic
+          echo autosar:1 >> cppcheck-premium-git.lic
+          echo cert:1 >> cppcheck-premium-git.lic
+          echo misra:1 >> cppcheck-premium-git.lic
+          echo licensed-to:Cppcheck CI >> cppcheck-premium-git.lic
 
       - name: Check
         run: |
-          cppcheckpremium/premiumaddon --check-loc-license cppcheck.lic > cppcheck-premium-loc
-          cppcheckpremium/cppcheck --premium=safety-off -j$(nproc) -D__GNUC__ -D__CPPCHECK__ --suppressions-list=cppcheckpremium-suppressions --platform=unix64 --enable=style --premium=misra-c++-2023 --premium=cert-c++-2016 --inline-suppr lib --error-exitcode=0 --output-format=sarif 2> results.sarif
+          cppcheckpremium/cppcheck --premium-license-file=cppcheck-premium-git.lic --premium=safety-off -j$(nproc) -D__GNUC__ -D__CPPCHECK__ --suppressions-list=cppcheckpremium-suppressions --platform=unix64 --enable=style --premium=misra-c++-2023 --premium=cert-c++-2016 --inline-suppr lib --error-exitcode=0 --output-format=sarif 2> results.sarif
 
       - name: Cat results
         run: |

AUTHORS

@@ -85,6 +85,7 @@ Cary Converse
 Cary R
 Caspar Kielwein
 Changkyoon Kim
+Chencheng Mao
 Chris Lalancette
 Christian Ehrlicher
 Christian Franke

Makefile

@@ -615,7 +615,7 @@ $(libcppdir)/forwardanalyzer.o: lib/forwardanalyzer.cpp lib/analyzer.h lib/astut
 $(libcppdir)/fwdanalysis.o: lib/fwdanalysis.cpp lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/fwdanalysis.cpp
 
-$(libcppdir)/importproject.o: lib/importproject.cpp externals/picojson/picojson.h externals/tinyxml2/tinyxml2.h lib/checkers.h lib/config.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/importproject.o: lib/importproject.cpp externals/picojson/picojson.h externals/tinyxml2/tinyxml2.h lib/checkers.h lib/config.h lib/filesettings.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/importproject.cpp
 
 $(libcppdir)/infer.o: lib/infer.cpp lib/calculate.h lib/config.h lib/errortypes.h lib/infer.h lib/mathlib.h lib/smallvector.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueptr.h lib/vfvalue.h
@@ -819,7 +819,7 @@ test/testfunctions.o: test/testfunctions.cpp lib/check.h lib/checkers.h lib/chec
 test/testgarbage.o: test/testgarbage.cpp lib/check.h lib/checkers.h lib/checks.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testgarbage.cpp
 
-test/testimportproject.o: test/testimportproject.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h lib/xml.h test/fixture.h test/redirect.h
+test/testimportproject.o: test/testimportproject.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testimportproject.cpp
 
 test/testincompletestatement.o: test/testincompletestatement.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h

cli/filelister.cpp

@@ -168,6 +168,10 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
     if (path.empty())
         return "no path specified";
 
+    const std::string::size_type nulPos = path.find('\0');
+    if (nulPos != std::string::npos)
+        return "path '" + path.substr(0, nulPos) + "' contains a NUL character";
+
     std::list<FileWithDetails> filesSorted;
 
     std::string err = addFiles2(filesSorted, path, extra, recursive, ignored, debug);
@@ -285,6 +289,10 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
     if (path.empty())
         return "no path specified";
 
+    const std::string::size_type nulPos = path.find('\0');
+    if (nulPos != std::string::npos)
+        return "path '" + path.substr(0, nulPos) + "' contains a NUL character";
+
     std::string corrected_path = path;
     if (endsWith(corrected_path, '/'))
         corrected_path.erase(corrected_path.end() - 1);

cppcheckpremium-suppressions

@@ -1,8 +1,10 @@
 
 # open source warnings are handled by the selfcheck.yml
+knownConditionTrueFalse
 noExplicitConstructor
 postfixOperator
 shadowFunction
+uninitMemberVarNoCtor
 useStlAlgorithm
 normalCheckLevelMaxBranches
 
@@ -19,8 +21,20 @@ premium-cert-int36-c
 
 # too picky
 premium-cert-arr30-c
+premium-cert-ctr50-cpp
+premium-cert-dcl06-c
+premium-cert-dcl51-cpp
+premium-cert-exp20-c
+premium-cert-exp34-c
+premium-cert-int13-c
+premium-cert-int30-c
+premium-cert-int31-c
 premium-cert-int32-c
+premium-cert-pre05-c
+premium-cert-pre12-c
 premium-cert-str34-c
+premium-cert-str53-cpp
+
 
 # we intentionally pass structs
 premium-cert-dcl39-c-*

lib/astutils.cpp

@@ -1554,7 +1554,7 @@ bool isUsedAsBool(const Token* const tok, const Settings& settings)
         return true;
     if (parent->isCast())
         return !Token::simpleMatch(parent->astOperand1(), "dynamic_cast") && isUsedAsBool(parent, settings);
-    if (Token::Match(parent, "==|!=") && tok->valueType() && tok->valueType()->pointer &&
+    if (Token::Match(parent, "==|!=") && ((tok->valueType() && tok->valueType()->pointer) || tok->function()) &&
         tok->astSibling()->hasKnownIntValue() && tok->astSibling()->getKnownIntValue() == 0)
         return true;
     if (parent->str() == "(" && astIsRHS(tok) && Token::Match(parent->astOperand1(), "if|while"))

lib/checkclass.cpp

@@ -1425,11 +1425,11 @@ void CheckClassImpl::privateFunctions()
     }
 }
 
-void CheckClassImpl::unusedPrivateFunctionError(const Token* tok1, const Token *tok2, const std::string &classname, const std::string &funcname)
+void CheckClassImpl::unusedPrivateFunctionError(const Token* tokImpl, const Token *tokDef, const std::string &classname, const std::string &funcname)
 {
-    std::list<const Token *> toks{ tok1 };
-    if (tok2)
-        toks.push_front(tok2);
+    std::list<const Token *> toks{ tokDef };
+    if (tokDef != tokImpl)
+        toks.push_back(tokImpl);
     reportError(toks, Severity::style, "unusedPrivateFunction", "$symbol:" + classname + "::" + funcname + "\nUnused private function: '$symbol'", CWE398, Certainty::normal);
 }
 

lib/checkclass.h

@@ -186,7 +186,7 @@ class CPPCHECKLIB CheckClassImpl : public CheckImpl {
     void uninitVarError(const Token *tok, const std::string &classname, const std::string &varname);
     void missingMemberCopyError(const Token *tok, FunctionType functionType, const std::string& classname, const std::string& varname);
     void operatorEqVarError(const Token *tok, const std::string &classname, const std::string &varname, bool inconclusive);
-    void unusedPrivateFunctionError(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &funcname);
+    void unusedPrivateFunctionError(const Token *tokImpl, const Token *tokDef, const std::string &classname, const std::string &funcname);
     void memsetError(const Token *tok, const std::string &memfunc, const std::string &classname, const std::string &type, bool isContainer = false);
     void memsetErrorReference(const Token *tok, const std::string &memfunc, const std::string &type);
     void memsetErrorFloat(const Token *tok, const std::string &type);