Merge branch 'main' into improve-enable-all-docs

preenu91 · preenu91 · commit cb410cfee349 · 2025-09-22T21:10:41.000+01:00
Updating
diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13, macos-15]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
@@ -75,7 +75,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13, macos-15]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
@@ -195,7 +195,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13, macos-15]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
@@ -229,7 +229,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13, macos-15]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
@@ -263,7 +263,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13, macos-15]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
@@ -287,7 +287,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-13, macos-15]  # non-macos platforms are already built with Boost in other contexts
+        os: [macos-15]  # non-macos platforms are already built with Boost in other contexts
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
@@ -348,12 +348,10 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13, macos-15]
+        os: [ubuntu-22.04, macos-15]
         include:
           - xdist_n: auto
           # FIXME: test_color_tty fails with xdist - see #13278
-          - os: macos-13
-            xdist_n: '1'
           - os: macos-15
             xdist_n: '1'
       fail-fast: false # Prefer quick result
diff --git a/.github/workflows/scriptcheck.yml b/.github/workflows/scriptcheck.yml
@@ -203,7 +203,7 @@ jobs:
   dmake:
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13, macos-15, windows-2025]
+        os: [ubuntu-22.04, macos-15, windows-2025]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -564,7 +564,7 @@ ValueFlow::Value CheckBufferOverrun::getBufferSize(const Token *bufTok) const
     if (!var || var->isPointer())
         return ValueFlow::Value(-1);
 
-    const MathLib::bigint dim = std::accumulate(var->dimensions().cbegin(), var->dimensions().cend(), 1LL, [](MathLib::bigint i1, const Dimension &dim) {
+    const MathLib::bigint dim = std::accumulate(var->dimensions().cbegin(), var->dimensions().cend(), MathLib::bigint(1), [](MathLib::bigint i1, const Dimension &dim) {
         return i1 * dim.num;
     });
 
diff --git a/lib/checktype.cpp b/lib/checktype.cpp
@@ -511,7 +511,7 @@ void CheckType::checkFloatToIntegerOverflow(const Token *tok, const ValueType *v
                 bits = mSettings->platform.long_long_bit;
             else
                 continue;
-            if (bits < MathLib::bigint_bits && f.floatValue >= (static_cast<MathLib::biguint>(1) << bits))
+            if (bits < MathLib::bigint_bits && f.floatValue >= (1ULL << bits))
                 floatToIntegerOverflowError(tok, f);
         }
     }
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
@@ -785,7 +785,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
     if (nodeType == BreakStmt)
         return addtoken(tokenList, "break");
     if (nodeType == CharacterLiteral) {
-        const int c = MathLib::toBigNumber(mExtTokens.back());
+        const int c = static_cast<int>(MathLib::toBigNumber(mExtTokens.back()));
         if (c == 0)
             return addtoken(tokenList, "\'\\0\'");
         if (c == '\r')
@@ -1582,7 +1582,7 @@ static void setValues(const Tokenizer &tokenizer, const SymbolDatabase *symbolDa
 
         MathLib::bigint typeSize = 0;
         for (const Variable &var: scope.varlist) {
-            const int mul = std::accumulate(var.dimensions().cbegin(), var.dimensions().cend(), 1, [](int v, const Dimension& dim) {
+            const MathLib::bigint mul = std::accumulate(var.dimensions().cbegin(), var.dimensions().cend(), MathLib::bigint(1), [](MathLib::bigint v, const Dimension& dim) {
                 return v * dim.num;
             });
             if (var.valueType())
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
@@ -227,14 +227,19 @@ bool ProgramMemory::empty() const
 }
 
 // NOLINTNEXTLINE(performance-unnecessary-value-param) - technically correct but we are moving the given values
-void ProgramMemory::replace(ProgramMemory pm)
+void ProgramMemory::replace(ProgramMemory pm, bool skipUnknown)
 {
     if (pm.empty())
         return;
 
     copyOnWrite();
 
     for (auto&& p : (*pm.mValues)) {
+        if (skipUnknown) {
+            auto it = mValues->find(p.first);
+            if (it != mValues->end() && it->second.isUninitValue())
+                continue;
+        }
         (*mValues)[p.first] = std::move(p.second);
     }
 }
@@ -438,7 +443,8 @@ static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok
             if (!setvar) {
                 if (!pm.hasValue(vartok->exprId())) {
                     const Token* valuetok = tok2->astOperand2();
-                    pm.setValue(vartok, execute(valuetok, pm, settings));
+                    ProgramMemory local = state;
+                    pm.setValue(vartok, execute(valuetok, local, settings));
                 }
             }
         } else if (Token::simpleMatch(tok2, ")") && tok2->link() &&
@@ -519,7 +525,7 @@ void ProgramMemoryState::replace(ProgramMemory pm, const Token* origin)
     if (origin)
         for (const auto& p : pm)
             origins[p.first.getExpressionId()] = origin;
-    state.replace(std::move(pm));
+    state.replace(std::move(pm), /*skipUnknown*/ true);
 }
 
 static void addVars(ProgramMemory& pm, const ProgramMemory::Map& vars)
@@ -532,13 +538,14 @@ static void addVars(ProgramMemory& pm, const ProgramMemory::Map& vars)
 
 void ProgramMemoryState::addState(const Token* tok, const ProgramMemory::Map& vars)
 {
-    ProgramMemory pm = state;
-    addVars(pm, vars);
-    fillProgramMemoryFromConditions(pm, tok, settings);
-    ProgramMemory local = pm;
+    ProgramMemory local = state;
+    addVars(local, vars);
+    fillProgramMemoryFromConditions(local, tok, settings);
+    ProgramMemory pm;
     fillProgramMemoryFromAssignments(pm, tok, settings, local, vars);
-    addVars(pm, vars);
-    replace(std::move(pm), tok);
+    local.replace(std::move(pm));
+    addVars(local, vars);
+    replace(std::move(local), tok);
 }
 
 void ProgramMemoryState::assume(const Token* tok, bool b, bool isEmpty)
diff --git a/lib/programmemory.h b/lib/programmemory.h
@@ -134,7 +134,7 @@ struct CPPCHECKLIB ProgramMemory {
 
     bool empty() const;
 
-    void replace(ProgramMemory pm);
+    void replace(ProgramMemory pm, bool skipUnknown = false);
 
     Map::const_iterator begin() const {
         return mValues->cbegin();
diff --git a/lib/token.h b/lib/token.h
@@ -778,10 +778,10 @@ class CPPCHECKLIB Token {
     bool setBits(const MathLib::bigint b) {
         const MathLib::bigint max = std::numeric_limits<short>::max();
         if (b > max) {
-            mImpl->mBits = max;
+            mImpl->mBits = static_cast<short>(max);
             return false;
         }
-        mImpl->mBits = b < 0 ? -1 : b;
+        mImpl->mBits = b < 0 ? -1 : static_cast<short>(b);
         return true;
     }
 
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -10025,7 +10025,7 @@ void Tokenizer::simplifyBitfields()
         }
 
         const auto tooLargeError = [this](const Token *tok) {
-            const MathLib::bigint max = std::numeric_limits<short>::max();
+            const auto max = std::numeric_limits<short>::max();
             reportError(tok,
                         Severity::warning,
                         "tooLargeBitField",
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -445,7 +445,7 @@ static Result accumulateStructMembers(const Scope* scope, F f, ValueFlow::Accura
         if (const ValueType* vt = var.valueType()) {
             if (vt->type == ValueType::Type::RECORD && vt->typeScope == scope)
                 return {0, false};
-            const MathLib::bigint dim = std::accumulate(var.dimensions().cbegin(), var.dimensions().cend(), 1LL, [](MathLib::bigint i1, const Dimension& dim) {
+            const MathLib::bigint dim = std::accumulate(var.dimensions().cbegin(), var.dimensions().cend(), MathLib::bigint(1), [](MathLib::bigint i1, const Dimension& dim) {
                 return i1 * dim.num;
             });
             if (var.nameToken()->scope() != scope && var.nameToken()->scope()->definedType) { // anonymous union
diff --git a/man/manual.md b/man/manual.md
@@ -105,15 +105,18 @@ need to use both approaches. Later chapters will describe this in more detail.
 
 With `--file-filter=<str>` you can configure file filter(s) and then only those files matching the filter will be checked.
 
-For example, this command below means that `src/test1.cpp` and `src/test/file1.cpp` could be checked, but `src/file2.cpp` will not be checked:
-
-    cppcheck src/ --file-filter=src/test*
-
 You can use `**`, `*` and `?` in the file filter pattern.  
 `**`: matches zero or more characters, including path separators  
 `*`: matches zero or more characters, excluding path separators  
 `?`: matches any single character except path separators
 
+For example, this command below means that `src/test1.cpp` could be checked, but `src/file2.cpp` and `src/test/file1.cpp` will not be checked:
+
+    cppcheck src/ --file-filter=src/test*
+
+Cppcheck first collects all files in the specified directory, then applies the filter. Therefore, the filter pattern
+must include the directory path you specified.
+
 A common use case for `--file-filter` is to check a project, but only check certain files:
 
     cppcheck --project=compile_commands.json --file-filter=src/*.c
@@ -150,8 +153,8 @@ By default Cppcheck uses an internal C/C++ parser. However there is an experimen
 
 Install `clang`. Then use Cppcheck option `--clang`.
 
-Technically, Cppcheck will execute `clang` with its `-ast-dump` option. The Clang output is then imported and converted into 
-the normal Cppcheck format. And then normal Cppcheck analysis is performed on that.
+Cppcheck executes clang with the -ast-dump option, imports the output, converts it to Cppcheck's internal format, and then
+performs standard analysis.
 
 You can also pass a custom Clang executable to the option by using for example `--clang=clang-10`. You can also pass it 
 with a path. On Windows it will append the `.exe` extension unless you use a path.
@@ -191,9 +194,8 @@ be improved.
 
 Cppcheck instantiates the templates in your code.
 
-If your templates are recursive this can lead to slow analysis that uses a lot
-of memory. Cppcheck will write information messages when there are potential
-problems.
+If your templates are recursive, this can lead to slow analysis and high memory usage. Cppcheck will write information
+messages when there are potential problems.
 
 Example code:
 
@@ -250,7 +252,7 @@ Using a Cppcheck build folder is not mandatory but it is recommended.
 
 Cppcheck save analyzer information in that folder.
 
-The advantages are;
+The advantages are:
 
 - It speeds up the analysis as it makes incremental analysis possible. Only changed files are analyzed when you recheck.
 - Whole program analysis also when multiple threads are used.
@@ -286,7 +288,7 @@ To ignore certain folders in the project you can use `-i`. This will skip the an
 
 ## CMake
 
-Generate a compile database:
+Generate a compile database (a JSON file containing compilation commands for each source file):
 
     cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .
 
@@ -369,9 +371,12 @@ Here is a file that has 3 bugs (when x,y,z are assigned).
     #error C must be defined
     #endif
 
+The flag `-D` tells Cppcheck that a name is defined. Cppcheck will only analyze configurations that
+contain this define.
+
+The flag `-U` tells Cppcheck that a name is not defined. Cppcheck will only analyze configurations
+that does not contain this define.
 
-The flag `-D` tells Cppcheck that a name is defined. There will be no Cppcheck analysis without this define.
-The flag `-U` tells Cppcheck that a name is not defined. There will be no Cppcheck analysis with this define.
 The flag `--force` and `--max-configs` is used to control how many combinations are checked. When `-D` is used,
 Cppcheck will only check 1 configuration unless these are used.
 
@@ -477,7 +482,8 @@ build dir. For instance, the unusedFunction warnings require whole program analy
 
 If you want to filter out certain errors from being generated, then it is possible to suppress these.
 
-If you encounter a false positive, then please report it to the Cppcheck team so that it can be fixed.
+If you encounter a false positive, please report it to the Cppcheck team so that the issue can be
+fixed.
 
 ## Plain text suppressions
 
diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
@@ -1279,7 +1279,7 @@ class TestClangImport : public TestFixture {
         ASSERT(!!tok);
         tok = tok->next();
         ASSERT(tok->hasKnownIntValue());
-        ASSERT_EQUALS(44, tok->getKnownIntValue());
+        ASSERT_EQUALS(MathLib::bigint(44), tok->getKnownIntValue());
     }
 
     void valueFlow2() {
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
@@ -6588,6 +6588,23 @@ class TestUninitVar : public TestFixture {
                         "    return c.front();\n"
                         "}\n");
         ASSERT_EQUALS("[test.cpp:8:12]: (error) Uninitialized variable: c [uninitvar]\n", errout_str());
+
+        // #13930
+        valueFlowUninit("extern int32_t g_items[10U];\n"
+                        "uint16_t write_item(uint8_t n);\n"
+                        "uint16_t write_item(uint8_t n) {\n"
+                        "    int32_t *p_item = NULL;\n"
+                        "    uint16_t ret;\n"
+                        "    ret = 0U;\n"
+                        "    if (n < 10U)\n"
+                        "        p_item = &g_items[n];\n"
+                        "    else\n"
+                        "        ret = 1U;\n"
+                        "    if (ret == 0U) \n"
+                        "        *p_item = 5;\n"
+                        "    return ret;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void valueFlowUninitBreak() { // Do not show duplicate warnings about the same uninitialized value

Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ void CheckType::checkFloatToIntegerOverflow(const Token tok, const ValueType v`
`511`	`511`	`bits = mSettings->platform.long_long_bit;`
`512`	`512`	`else`
`513`	`513`	`continue;`
`514`		`- if (bits < MathLib::bigint_bits && f.floatValue >= (static_cast<MathLib::biguint>(1) << bits))`
	`514`	`+ if (bits < MathLib::bigint_bits && f.floatValue >= (1ULL << bits))`
`515`	`515`	`floatToIntegerOverflowError(tok, f);`
`516`	`516`	`}`
`517`	`517`	`}`
Original file line number	Diff line number	Diff line change
`@@ -778,10 +778,10 @@ class CPPCHECKLIB Token {`
`778`	`778`	`bool setBits(const MathLib::bigint b) {`
`779`	`779`	`const MathLib::bigint max = std::numeric_limits<short>::max();`
`780`	`780`	`if (b > max) {`
`781`		`- mImpl->mBits = max;`
	`781`	`+ mImpl->mBits = static_cast<short>(max);`
`782`	`782`	`return false;`
`783`	`783`	`}`
`784`		`- mImpl->mBits = b < 0 ? -1 : b;`
	`784`	`+ mImpl->mBits = b < 0 ? -1 : static_cast<short>(b);`
`785`	`785`	`return true;`
`786`	`786`	`}`
`787`	`787`
Original file line number	Diff line number	Diff line change
`@@ -10025,7 +10025,7 @@ void Tokenizer::simplifyBitfields()`
`10025`	`10025`	`}`
`10026`	`10026`
`10027`	`10027`	`const auto tooLargeError = [this](const Token *tok) {`
`10028`		`- const MathLib::bigint max = std::numeric_limits<short>::max();`
	`10028`	`+ const auto max = std::numeric_limits<short>::max();`
`10029`	`10029`	`reportError(tok,`
`10030`	`10030`	`Severity::warning,`
`10031`	`10031`	`"tooLargeBitField",`