Merge branch 'main' into chr_13678

chrchr-github · web-flow · commit ce003fcda629 · 2026-06-22T14:25:57.000+02:00
diff --git a/.github/workflows/selfcheck.yml b/.github/workflows/selfcheck.yml
@@ -121,7 +121,7 @@ jobs:
 
       - name: Self check (unusedFunction / no test / no gui)
         run: |
-          supprs="--suppress=unusedFunction:lib/errorlogger.h:197 --suppress=unusedFunction:lib/importproject.cpp:1666 --suppress=unusedFunction:lib/importproject.cpp:1690"
+          supprs="--suppress=unusedFunction:lib/errorlogger.h:197 --suppress=unusedFunction:lib/importproject.cpp:1671 --suppress=unusedFunction:lib/importproject.cpp:1695"
           ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib -D__CPPCHECK__ -D__GNUC__ --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest_nogui/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr $supprs
         env:
           DISABLE_VALUEFLOW: 1
diff --git a/AUTHORS b/AUTHORS
@@ -206,6 +206,7 @@ Jonathan Clohessy
 Jonathan Haehne
 Jonathan Neuschäfer
 Jonathan Thackray
+Jonny Paton
 José Martins
 Jose Roquette
 Joshua Beck
diff --git a/gui/checkstatistics.cpp b/gui/checkstatistics.cpp
@@ -109,10 +109,10 @@ unsigned CheckStatistics::getCount(const QString &tool, ShowTypes::ShowType type
 QStringList CheckStatistics::getTools() const
 {
     QSet<QString> ret;
-    for (const QString& tool: mStyle.keys()) ret.insert(tool);
-    for (const QString& tool: mWarning.keys()) ret.insert(tool);
-    for (const QString& tool: mPerformance.keys()) ret.insert(tool);
-    for (const QString& tool: mPortability.keys()) ret.insert(tool);
-    for (const QString& tool: mError.keys()) ret.insert(tool);
+    std::copy(mStyle.keyBegin(), mStyle.keyEnd(), std::inserter(ret, ret.end()));
+    std::copy(mWarning.keyBegin(), mWarning.keyEnd(), std::inserter(ret, ret.end()));
+    std::copy(mPerformance.keyBegin(), mPerformance.keyEnd(), std::inserter(ret, ret.end()));
+    std::copy(mPortability.keyBegin(), mPortability.keyEnd(), std::inserter(ret, ret.end()));
+    std::copy(mError.keyBegin(), mError.keyEnd(), std::inserter(ret, ret.end()));
     return ret.values();
 }
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -2592,6 +2592,8 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Setti
     if (const Variable* var = tok->variable()) {
         if (tok == var->nameToken() && (!var->isReference() || (var->isConst() && var->type() == tok1->type())) && (!var->isClass() || (var->valueType() && var->valueType()->container))) // const ref or passed to (copy) ctor
             return false;
+        if (var->isArray() && var->valueType() && var->valueType()->pointer == 0 && var->valueType()->isPrimitive())
+            return false;
     }
 
     std::vector<const Variable*> args = getArgumentVars(tok, argnr);
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -556,8 +556,16 @@ ValueFlow::Value CheckBufferOverrunImpl::getBufferSize(const Token *bufTok) cons
 {
     if (!bufTok->valueType())
         return ValueFlow::Value(-1);
-    if (bufTok->isUnaryOp("&"))
+
+    if (bufTok->isUnaryOp("&")) {
         bufTok = bufTok->astOperand1();
+        if (Token::simpleMatch(bufTok, "[")) {
+            const Token* index = bufTok->astOperand2();
+            if (!(index && index->hasKnownIntValue() && index->getKnownIntValue() == 0))
+                return ValueFlow::Value(-1);
+            bufTok = bufTok->astOperand1();
+        }
+    }
     const Variable *var = bufTok->variable();
 
     if (!var || var->dimensions().empty()) {
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -1289,7 +1289,7 @@ void CheckOtherImpl::checkVariableScope()
                 tok = tok->link();
 
                 // parse else if blocks..
-            } else if (Token::simpleMatch(tok, "else { if (") && tok->next()->isSimplifiedScope() && Token::simpleMatch(tok->linkAt(3), ") {")) {
+            } else if (Token::simpleMatch(tok, "else { if (") && tok->next()->isInsertedBrace() && Token::simpleMatch(tok->linkAt(3), ") {")) {
                 tok = tok->next();
             } else if (tok->varId() == var->declarationId() || tok->str() == "goto") {
                 reduce = false;
@@ -1415,7 +1415,7 @@ bool CheckOtherImpl::checkInnerScope(const Token *tok, const Variable* var, bool
                 if (scope->type == ScopeType::eSwitch)
                     return false; // Used in outer switch scope - unsafe or impossible to reduce scope
 
-                if (scope->bodyStart && scope->bodyStart->isSimplifiedScope())
+                if (scope->bodyStart && scope->bodyStart->isSimplifiedIfInitStmt())
                     return false; // simplified if/for/switch init statement
             }
             if (var->isArrayOrPointer()) {
@@ -4055,7 +4055,7 @@ void CheckOtherImpl::checkFuncArgNamesDifferent()
                     break;
                 }
                 // skip over templates and arrays
-                if (decl->link() && !Token::Match(decl, "[()]"))
+                if (decl->link() && precedes(decl, decl->link()) && !Token::Match(decl, "( [*&]"))
                     decl = decl->link();
                 else if (decl->varId())
                     declarations[j] = decl;
@@ -4589,6 +4589,7 @@ void CheckOtherImpl::checkUnionZeroInit()
     std::unordered_map<const Scope *, Union> unionsByScopeId;
     const std::vector<Union> unions = parseUnions(*symbolDatabase, mSettings);
     for (const Union &u : unions) {
+        // cppcheck-suppress useStlAlgorithm - std::transform is cumbersome
         unionsByScopeId.emplace(u.scope, u);
     }
 
diff --git a/lib/checks.h b/lib/checks.h
@@ -29,6 +29,6 @@ namespace CheckInstances
 {
     /** List of registered check classes. This is used by Cppcheck to run checks and generate documentation */
     CPPCHECKLIB const std::list<Check *>& get();
-};
+}
 
 #endif // checksH
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -637,12 +637,14 @@ void CheckStlImpl::iterators()
 void CheckStlImpl::mismatchingContainerIteratorError(const Token* containerTok, const Token* iterTok, const Token* containerTok2)
 {
     const std::string container(containerTok ? containerTok->expressionString() : std::string("v1"));
+    const std::string containerTemp(isTemporary(containerTok, &mSettings.library) ? " temporary " : " ");
     const std::string container2(containerTok2 ? containerTok2->expressionString() : std::string("v2"));
+    const std::string containerTemp2(isTemporary(containerTok2, &mSettings.library) ? " temporary " : " ");
     const std::string iter(iterTok ? iterTok->expressionString() : std::string("it"));
     reportError(containerTok,
                 Severity::error,
                 "mismatchingContainerIterator",
-                "Iterator '" + iter + "' referring to container '" + container2 + "' is used with container '" + container + "'.",
+                "Iterator '" + iter + "' referring to" + containerTemp2 + "container '" + container2 + "' is used with" + containerTemp + "container '" + container + "'.",
                 CWE664,
                 Certainty::normal);
 }
@@ -884,7 +886,7 @@ void CheckStlImpl::mismatchingContainerIterator()
             const std::vector<const Token *> args = getArguments(ftok);
 
             const Library::Container * c = tok->valueType()->container;
-            const Library::Container::Action action = c->getAction(tok->strAt(2));
+            const Library::Container::Action action = c->getAction(ftok->str());
             const Token* iterTok = nullptr;
             if (action == Library::Container::Action::INSERT && args.size() == 2) {
                 // Skip if iterator pair
@@ -3116,19 +3118,18 @@ void CheckStlImpl::useStlAlgorithm()
             bool useLoopVarInMemCall;
             const Token *memberAccessTok = singleMemberCallInScope(bodyTok, loopVar->varId(), useLoopVarInMemCall, mSettings);
             if (memberAccessTok && loopType == LoopType::RANGE) {
-                const Token *memberCallTok = memberAccessTok->astOperand2();
                 const int contVarId = memberAccessTok->astOperand1()->varId();
                 if (contVarId == loopVar->varId())
                     continue;
-                if (memberCallTok->str() == "push_back" ||
-                    memberCallTok->str() == "push_front" ||
-                    memberCallTok->str() == "emplace_back") {
+                using Action = Library::Container::Action;
+                const auto action = astContainerAction(memberAccessTok->astOperand1(), mSettings.library);
+                if (contains({Action::PUSH, Action::INSERT}, action)) {
                     std::string algo;
                     if (useLoopVarInMemCall)
                         algo = "std::copy";
                     else
                         algo = "std::transform";
-                    useStlAlgorithmError(memberCallTok, algo);
+                    useStlAlgorithmError(memberAccessTok->astOperand2(), algo);
                 }
                 continue;
             }
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -825,6 +825,7 @@ unsigned int CppCheck::check(const FileSettings &fs)
     else
         tempSettings.userDefines += fs.cppcheckDefines();
     tempSettings.includePaths = fs.includePaths;
+    tempSettings.userIncludes.insert(tempSettings.userIncludes.end(), fs.forcedIncludes.cbegin(), fs.forcedIncludes.cend());
     tempSettings.userUndefs.insert(fs.undefs.cbegin(), fs.undefs.cend());
     if (fs.standard.find("++") != std::string::npos)
         tempSettings.standards.setCPP(fs.standard);
diff --git a/lib/filesettings.h b/lib/filesettings.h
@@ -148,6 +148,7 @@ struct CPPCHECKLIB FileSettings {
     }
     std::set<std::string> undefs;
     std::list<std::string> includePaths;
+    std::list<std::string> forcedIncludes;
     // only used by clang mode
     std::list<std::string> systemIncludePaths;
     std::string standard;
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -149,6 +149,11 @@ void ImportProject::parseArgs(FileSettings &fs, const std::vector<std::string> &
             continue;
         }
 
+        if (!(optArg = getOptArg({ "-include", "/FI", "-FI" }, i)).empty()) {
+            fs.forcedIncludes.push_back(std::move(optArg));
+            continue;
+        }
+
         if (!(optArg = getOptArg({ "-D", "/D" }, i)).empty()) {
             defs += optArg + ";";
             continue;
diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -79,8 +79,8 @@ Settings::~Settings() = default;
 Settings::Settings(const Settings&) = default;
 Settings & Settings::operator=(const Settings &) = default;
 
-Settings::Settings(Settings&&) noexcept = default;
-Settings & Settings::operator=(Settings &&) noexcept = default;
+Settings::Settings(Settings&&) CPPCHECK_NOEXCEPT = default;
+Settings & Settings::operator=(Settings &&) CPPCHECK_NOEXCEPT = default;
 
 std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppressions, bool debug)
 {
diff --git a/lib/settings.h b/lib/settings.h
@@ -94,6 +94,16 @@ class SimpleEnableGroup {
 };
 
 
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 9
+// Hack to workaround GCC bug.
+// Details: https://trac.cppcheck.net/ticket/14850
+// seen on g++ before 10.x
+#define  CPPCHECK_NOEXCEPT
+#else
+#define  CPPCHECK_NOEXCEPT  noexcept
+#endif
+
+
 /**
  * @brief This is just a container for general settings so that we don't need
  * to pass individual values to functions or constructors now or in the
@@ -113,8 +123,8 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     Settings(const Settings&);
     Settings& operator=(const Settings&);
 
-    Settings(Settings&&) noexcept;
-    Settings& operator=(Settings&&) noexcept;
+    Settings(Settings&&) CPPCHECK_NOEXCEPT;
+    Settings& operator=(Settings&&) CPPCHECK_NOEXCEPT;
 
     static std::string loadCppcheckCfg(Settings& settings, Suppressions& suppressions, bool debug = false);
 
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -1246,6 +1246,7 @@ void SymbolDatabase::createSymbolDatabaseSetTypePointers()
 {
     std::unordered_set<std::string> typenames;
     for (const Type &t : typeList) {
+        // cppcheck-suppress useStlAlgorithm - std::transform is cumbersome
         typenames.insert(t.name());
     }
 
@@ -4599,8 +4600,7 @@ void SymbolDatabase::printXml(std::ostream &out) const
     }
 
     // Variables..
-    for (const Variable *var : mVariableList)
-        variables.insert(var);
+    std::copy(mVariableList.begin(), mVariableList.end(), std::inserter(variables, variables.end()));
     outs += "  <variables>\n";
     for (const Variable *var : variables) {
         if (!var)
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -3916,6 +3916,7 @@ void TemplateSimplifier::simplifyTemplates(const std::time_t maxtime)
         std::unordered_map<std::string, int> nameOrdinal;
         int ordinal = 0;
         for (const auto& decl : mTemplateDeclarations) {
+            // cppcheck-suppress useStlAlgorithm - std::transform is cumbersome
             nameOrdinal.emplace(decl.fullName(), ordinal++);
         }
 
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -204,7 +204,6 @@ static const std::unordered_set<std::string> stdTypes = { "bool"
                                                           , "int"
                                                           , "long"
                                                           , "short"
-                                                          , "size_t"
                                                           , "void"
                                                           , "wchar_t"
                                                           , "signed"
diff --git a/lib/token.h b/lib/token.h
@@ -732,11 +732,11 @@ class CPPCHECKLIB Token {
         setFlag(fIsTemplate, b);
     }
 
-    bool isSimplifiedScope() const {
-        return getFlag(fIsSimplifedScope);
+    bool isSimplifiedIfInitStmt() const {
+        return getFlag(fIsSimplifiedIfInitStmt);
     }
-    void isSimplifiedScope(bool b) {
-        setFlag(fIsSimplifedScope, b);
+    void isSimplifiedIfInitStmt(bool b) {
+        setFlag(fIsSimplifiedIfInitStmt, b);
     }
 
     bool isFinalType() const {
@@ -767,6 +767,14 @@ class CPPCHECKLIB Token {
         setFlag(fIsAnonymous, b);
     }
 
+    bool isInsertedBrace() const {
+        return getFlag(fIsInsertedBrace);
+    }
+    Token* isInsertedBrace(bool b) {
+        setFlag(fIsInsertedBrace, b);
+        return this;
+    }
+
     // cppcheck-suppress unusedFunction
     bool isBitfield() const {
         return mImpl->mBits >= 0;
@@ -1498,7 +1506,7 @@ class CPPCHECKLIB Token {
         fIsImplicitInt          = (1ULL << 33), // Is "int" token implicitly added?
         fIsInline               = (1ULL << 34), // Is this a inline type
         fIsTemplate             = (1ULL << 35),
-        fIsSimplifedScope       = (1ULL << 36), // scope added when simplifying e.g. if (int i = ...; ...)
+        fIsSimplifiedIfInitStmt = (1ULL << 36), // simplified if/switch/while init statement e.g. if (int i = ...; ...) => { int i = ...; if (..) ..  }
         fIsRemovedVoidParameter = (1ULL << 37), // A void function parameter has been removed
         fIsIncompleteConstant   = (1ULL << 38),
         fIsRestrict             = (1ULL << 39), // Is this a restrict pointer type
@@ -1508,6 +1516,7 @@ class CPPCHECKLIB Token {
         fIsInitComma            = (1ULL << 43), // Is this comma located inside some {..}. i.e: {1,2,3,4}
         fIsInitBracket          = (1ULL << 44), // Is this bracket used as a part of variable initialization i.e: int a{5}, b(2);
         fIsAnonymous            = (1ULL << 45), // Is this a token added for an unnamed member
+        fIsInsertedBrace        = (1ULL << 46), // brace added when simplifying e.g. if (x) f(); => if (x) { f(); }
     };
 
     enum : std::uint8_t {
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -6218,6 +6218,8 @@ void Tokenizer::dump(std::ostream &out) const
         }
         if (tok->isRemovedVoidParameter())
             outs += " isRemovedVoidParameter=\"true\"";
+        if (tok->isInsertedBrace())
+            outs += " isInsertedBrace=\"true\"";
         if (tok->isSplittedVarDeclComma())
             outs += " isSplittedVarDeclComma=\"true\"";
         if (tok->isSplittedVarDeclEq())
@@ -7004,10 +7006,12 @@ Token *Tokenizer::simplifyAddBracesPair(Token *tok, bool commandWithCondition)
         tokAfterCondition->previous()->insertToken("{");
         Token * tokOpenBrace=tokAfterCondition->previous();
         tokOpenBrace->column(tokAfterCondition->column());
+        tokOpenBrace->isInsertedBrace(true);
 
         tokEnd->insertToken("}");
         Token * tokCloseBrace=tokEnd->next();
         tokCloseBrace->column(tokEnd->column());
+        tokCloseBrace->isInsertedBrace(true);
 
         Token::createMutualLinks(tokOpenBrace,tokCloseBrace);
         tokBracesEnd=tokCloseBrace;
@@ -8038,8 +8042,8 @@ void Tokenizer::elseif()
 
             if (Token::Match(tok2, "}|;")) {
                 if (tok2->next() && tok2->strAt(1) != "else") {
-                    tok->insertToken("{")->isSimplifiedScope(true);
-                    tok2->insertToken("}")->isSimplifiedScope(true);
+                    tok->insertToken("{")->isInsertedBrace(true);
+                    tok2->insertToken("}")->isInsertedBrace(true);
                     Token::createMutualLinks(tok->next(), tok2->next());
                     break;
                 }
@@ -8105,7 +8109,8 @@ void Tokenizer::simplifyIfSwitchForInit()
         tok->str("{");
         endscope->insertToken("}");
         Token::createMutualLinks(tok, endscope->next());
-        tok->isSimplifiedScope(true);
+        tok->isInsertedBrace(true);
+        tok->isSimplifiedIfInitStmt(true);
     }
 }
 
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -1696,6 +1696,8 @@ static Token * createAstAtToken(Token *tok)
                 tok->next()->astOperand1(tok);
                 tok->next()->astOperand2(colon);
 
+                createAstAtTokenInner(colon, tok->linkAt(1), cpp);
+
                 return decl;
             }
         }
diff --git a/lib/vf_settokenvalue.cpp b/lib/vf_settokenvalue.cpp
@@ -613,7 +613,7 @@ namespace ValueFlow
         }
 
         // unary minus
-        else if (parent->isUnaryOp("-")) {
+        else if (parent->isUnaryOp("-") && !astIsUnsigned(parent)) {
             for (const Value &val : tok->values()) {
                 if (!val.isIntValue() && !val.isFloatValue())
                     continue;
diff --git a/test/cfg/boost.cpp b/test/cfg/boost.cpp
@@ -157,6 +157,7 @@ void test_BOOST_FOREACH_5()
 {
     std::set<int> data;
     BOOST_FOREACH(const int& i, get_data())
+        // cppcheck-suppress useStlAlgorithm
         data.insert(i);
 }
 
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
diff --git a/test/testimportproject.cpp b/test/testimportproject.cpp
diff --git a/test/testother.cpp b/test/testother.cpp
diff --git a/test/teststl.cpp b/test/teststl.cpp
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
diff --git a/tools/dmake/dmake.cpp b/tools/dmake/dmake.cpp

Original file line number	Diff line number	Diff line change
`@@ -2592,6 +2592,8 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Setti`
`2592`	`2592`	`if (const Variable* var = tok->variable()) {`
`2593`	`2593`	`if (tok == var->nameToken() && (!var->isReference() \|\| (var->isConst() && var->type() == tok1->type())) && (!var->isClass() \|\| (var->valueType() && var->valueType()->container))) // const ref or passed to (copy) ctor`
`2594`	`2594`	`return false;`
	`2595`	`+ if (var->isArray() && var->valueType() && var->valueType()->pointer == 0 && var->valueType()->isPrimitive())`
	`2596`	`+ return false;`
`2595`	`2597`	`}`
`2596`	`2598`
`2597`	`2599`	`std::vector<const Variable*> args = getArgumentVars(tok, argnr);`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ namespace CheckInstances`
`29`	`29`	`{`
`30`	`30`	`/** List of registered check classes. This is used by Cppcheck to run checks and generate documentation */`
`31`	`31`	`CPPCHECKLIB const std::list<Check *>& get();`
`32`		`-};`
	`32`	`+}`
`33`	`33`
`34`	`34`	`#endif // checksH`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ struct CPPCHECKLIB FileSettings {`
`148`	`148`	`}`
`149`	`149`	`std::set<std::string> undefs;`
`150`	`150`	`std::list<std::string> includePaths;`
	`151`	`+ std::list<std::string> forcedIncludes;`
`151`	`152`	`// only used by clang mode`
`152`	`153`	`std::list<std::string> systemIncludePaths;`
`153`	`154`	`std::string standard;`