Merge branch 'main' into chr_11522

chrchr-github · web-flow · commit c56d4db99a26 · 2025-12-07T20:07:33.000+01:00
diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
@@ -571,6 +571,15 @@ jobs:
           warnings="-pedantic -Wall -Wextra -Wcast-qual -Wno-deprecated-declarations -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"
           g++ $warnings -c -Ilib -Iexternals/tinyxml2 democlient/democlient.cpp
 
+      - name: Test disabled executors
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          g++ -Ilib -c cli/threadexecutor.cpp -DDISALLOW_THREAD_EXECUTOR
+          test -z "$(nm threadexecutor.o)"
+          g++ -Ilib -c cli/processexecutor.cpp -DDISALLOW_PROCESS_EXECUTOR
+          test -z "$(nm processexecutor.o)"
+          # TODO: test NO_* defines
+
       - name: Show all ignored files
         if: false  # TODO: currently lists all the contents of ignored folders - we only need what actually matched
         run: |
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:193 --suppress=unusedFunction:lib/importproject.cpp:1508 --suppress=unusedFunction:lib/importproject.cpp:1532"
+          supprs="--suppress=unusedFunction:lib/errorlogger.h:193 --suppress=unusedFunction:lib/importproject.cpp:1516 --suppress=unusedFunction:lib/importproject.cpp:1540"
           ./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/cli/processexecutor.cpp b/cli/processexecutor.cpp
@@ -22,7 +22,7 @@
 
 #include "processexecutor.h"
 
-#if !defined(_WIN32) && !defined(__MINGW32__)
+#ifdef HAS_THREADING_MODEL_FORK
 
 #include "cppcheck.h"
 #include "errorlogger.h"
@@ -471,4 +471,4 @@ void ProcessExecutor::reportInternalChildErr(const std::string &childname, const
         mErrorLogger.reportErr(errmsg);
 }
 
-#endif // !WIN32
+#endif // HAS_THREADING_MODEL_FORK
diff --git a/cli/processexecutor.h b/cli/processexecutor.h
@@ -19,6 +19,10 @@
 #ifndef PROCESSEXECUTOR_H
 #define PROCESSEXECUTOR_H
 
+#include "config.h"
+
+#ifdef HAS_THREADING_MODEL_FORK
+
 #include "cppcheck.h"
 #include "executor.h"
 
@@ -72,4 +76,6 @@ class ProcessExecutor : public Executor {
 
 /// @}
 
+#endif // HAS_THREADING_MODEL_FORK
+
 #endif // PROCESSEXECUTOR_H
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
@@ -18,6 +18,8 @@
 
 #include "threadexecutor.h"
 
+#ifdef HAS_THREADING_MODEL_THREAD
+
 #include "config.h"
 #include "cppcheck.h"
 #include "errorlogger.h"
@@ -219,3 +221,5 @@ unsigned int ThreadExecutor::check()
 
     return result;
 }
+
+#endif // HAS_THREADING_MODEL_THREAD
diff --git a/cli/threadexecutor.h b/cli/threadexecutor.h
@@ -19,6 +19,10 @@
 #ifndef THREADEXECUTOR_H
 #define THREADEXECUTOR_H
 
+#include "config.h"
+
+#ifdef HAS_THREADING_MODEL_THREAD
+
 #include "cppcheck.h"
 #include "executor.h"
 
@@ -52,4 +56,6 @@ class ThreadExecutor : public Executor {
 
 /// @}
 
+#endif // HAS_THREADING_MODEL_THREAD
+
 #endif // THREADEXECUTOR_H
diff --git a/cmake/compilerDefinitions.cmake b/cmake/compilerDefinitions.cmake
@@ -50,6 +50,10 @@ if(DISALLOW_THREAD_EXECUTOR)
     add_definitions(-DDISALLOW_THREAD_EXECUTOR)
 endif()
 
+if(DISALLOW_PROCESS_EXECUTOR)
+    add_definitions(-DDISALLOW_PROCESS_EXECUTOR)
+endif()
+
 if(MSVC AND DISABLE_CRTDBG_MAP_ALLOC)
     add_definitions(-DDISABLE_CRTDBG_MAP_ALLOC)
 endif()
diff --git a/cmake/options.cmake b/cmake/options.cmake
@@ -92,6 +92,10 @@ option(DISALLOW_THREAD_EXECUTOR "Disallow usage of ThreadExecutor for -j"
 if(DISALLOW_THREAD_EXECUTOR AND WIN32)
     message(FATAL_ERROR "Cannot disable usage of ThreadExecutor on Windows as no other executor implementation is currently available")
 endif()
+option(DISALLOW_PROCESS_EXECUTOR "Disallow usage of ProcessExecutor for -j"                   OFF)
+if(DISALLOW_THREAD_EXECUTOR AND DISALLOW_PROCESS_EXECUTOR)
+    message(FATAL_ERROR "Cannot disable both ThreadExecutor and ProcessExecutor")
+endif()
 set(USE_BOOST "Auto" CACHE STRING "Usage of Boost")
 set_property(CACHE USE_BOOST PROPERTY STRINGS Auto Off On)
 option(USE_BOOST_INT128     "Usage of Boost.Multiprecision 128-bit integer for Mathlib"     OFF)
diff --git a/cmake/printInfo.cmake b/cmake/printInfo.cmake
@@ -78,6 +78,7 @@ if(HAVE_RULES)
 endif()
 message(STATUS)
 message(STATUS "DISALLOW_THREAD_EXECUTOR = ${DISALLOW_THREAD_EXECUTOR}")
+message(STATUS "DISALLOW_PROCESS_EXECUTOR = ${DISALLOW_PROCESS_EXECUTOR}")
 message(STATUS "CMAKE_THREAD_LIBS_INIT = ${CMAKE_THREAD_LIBS_INIT}")
 message(STATUS)
 message(STATUS "USE_BUNDLED_TINYXML2 =  ${USE_BUNDLED_TINYXML2}")
diff --git a/htmlreport/cppcheck-htmlreport b/htmlreport/cppcheck-htmlreport
@@ -412,7 +412,7 @@ def filter_button(enabled_filters, id, function):
     enabled = enabled_filters.get(id, False)
     if not id:
         id = 'None'
-    return '\n        <label class="checkBtn%s"><input type="checkbox" onclick="%s(this)" id="%s"%s/>%s</label>'\
+    return '\n        <label class="checkBtn%s"><input type="checkbox" onclick="%s(this)" id="%s" %s>%s</label>'\
           % (' disabled' if not enabled else '', function, id, 'checked' if enabled else 'disabled', id)
 
 def filter_bar(enabled):
@@ -428,8 +428,8 @@ def filter_bar(enabled):
     , classification_bar
     ,''.join([filter_button(enabled, tool, 'toggleTool') for tool in ['cppcheck', 'clang-tidy']])
     ,'\n        | '
-    ,'\n        <label class="severityHeader">File: <input type="search" oninput="filterFile(this.value)"/></label>'
-    ,'\n        <label class="severityHeader">Filter: <input type="search" oninput="filterText(this.value)"/></label>'
+    ,'\n        <label class="severityHeader">File: <input type="search" oninput="filterFile(this.value)"></label>'
+    ,'\n        <label class="severityHeader">Filter: <input type="search" oninput="filterText(this.value)"></label>'
     ,'\n      </div>\n'])
 def git_blame(errors, path, file, blame_options):
     last_line= errors[-1]['line']
@@ -837,8 +837,8 @@ def main() -> None:
                     lexer = guess_lexer(content, stripnl=False)
                 except ClassNotFound:
                     sys.stderr.write("ERROR: Couldn't determine lexer for the file' " + source_filename + " '. Won't be able to syntax highlight this file.")
-                    output_file.write("\n <tr><td colspan=\"5\"> Could not generate content because pygments failed to determine the code type.</td></tr>")
-                    output_file.write("\n <tr><td colspan=\"5\"> Sorry about this.</td></tr>")
+                    output_file.write("\n <tr><td colspan=\"6\"> Could not generate content because pygments failed to determine the code type.</td></tr>")
+                    output_file.write("\n <tr><td colspan=\"6\"> Sorry about this.</td></tr>")
                     continue
 
             if options.source_encoding:
@@ -932,10 +932,10 @@ def main() -> None:
             htmlfile = data.get('htmlfile') if is_file else None
 
             output_file.write("\n      <tbody class=\"fileEntry\">")
-            output_file.write("\n       <tr><td colspan=\"5\">%s</td></tr>" % row_content)
+            output_file.write("\n       <tr><td colspan=\"6\">%s</td></tr>" % row_content)
 
             if filename in decode_errors:
-                output_file.write("\n       <tr><td colspan=\"5\">Could not generated due to UnicodeDecodeError</td></tr>")
+                output_file.write("\n       <tr><td colspan=\"6\">Could not generated due to UnicodeDecodeError</td></tr>")
 
             sorted_errors = sorted(data['errors'], key=lambda k: k['line'])
             blame_data = git_blame(sorted_errors, source_dir, filename, blame_options) if add_author_information else []
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -1430,7 +1430,7 @@ static bool compareKnownValue(const Token * const tok1, const Token * const tok2
     if (v1 == tok1->values().end()) {
         return false;
     }
-    if (v1->isNonValue() || v1->isContainerSizeValue() || v1->isSymbolicValue())
+    if (v1->isNonValue() || v1->isContainerSizeValue() || v1->isBufferSizeValue() || v1->isSymbolicValue())
         return false;
     const auto v2 = std::find_if(tok2->values().cbegin(), tok2->values().cend(), isKnownFn);
     if (v2 == tok2->values().end()) {
diff --git a/lib/check64bit.cpp b/lib/check64bit.cpp
@@ -40,6 +40,14 @@ namespace {
     Check64BitPortability instance;
 }
 
+static bool is32BitIntegerReturn(const Function* func, const Settings* settings)
+{
+    if (settings->platform.sizeof_pointer != 8)
+        return false;
+    const ValueType* vt = func->arg->valueType();
+    return vt && vt->pointer == 0 && vt->isIntegral() && vt->typeSize(settings->platform) == 4;
+}
+
 static bool isFunctionPointer(const Token* tok)
 {
     if (!tok || !tok->variable())
@@ -64,7 +72,7 @@ void Check64BitPortability::pointerassignment()
         bool retPointer = false;
         if (scope->function->token->strAt(-1) == "*") // Function returns a pointer
             retPointer = true;
-        else if (Token::Match(scope->function->token->previous(), "int|long|DWORD")) // Function returns an integer
+        else if (is32BitIntegerReturn(scope->function, mSettings))
             ;
         else
             continue;
@@ -89,8 +97,17 @@ void Check64BitPortability::pointerassignment()
             if (retPointer && !returnType->typeScope && returnType->pointer == 0U)
                 returnIntegerError(tok);
 
-            if (!retPointer && returnType->pointer >= 1U)
-                returnPointerError(tok);
+            if (!retPointer) {
+                bool warn = returnType->pointer >= 1U;
+                if (!warn) {
+                    const Token* tok2 = tok->astOperand1();
+                    while (tok2 && tok2->isCast())
+                        tok2 = tok2->astOperand2() ? tok2->astOperand2() : tok2->astOperand1();
+                    warn = tok2 && tok2->valueType() && tok2->valueType()->pointer;
+                }
+                if (warn)
+                    returnPointerError(tok);
+            }
         }
     }
 
@@ -156,7 +173,7 @@ void Check64BitPortability::returnPointerError(const Token *tok)
                 "Returning an address value in a function with integer (int/long/etc) return type is not portable across "
                 "different platforms and compilers. For example in 32-bit Windows and Linux they are same width, but in "
                 "64-bit Windows and Linux they are of different width. In worst case you end up casting 64-bit address down "
-                "to 32-bit integer. The safe way is to always return an integer.", CWE758, Certainty::normal);
+                "to 32-bit integer. The safe way is to return a type such as intptr_t.", CWE758, Certainty::normal);
 }
 
 void Check64BitPortability::returnIntegerError(const Token *tok)
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
@@ -1399,7 +1399,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings,
             for (int p = 0; p < valuetype->pointer; p++)
                 tempToken->insertToken("*");
             tempToken = const_cast<Token*>(typeToken);
-            if (top->isBinaryOp() && valuetype->pointer == 1 && (valuetype->type == ValueType::CHAR || valuetype->type == ValueType::WCHAR_T))
+            if (top->isBinaryOp() && Token::Match(top, "[+-]") && valuetype->pointer == 1 && (valuetype->type == ValueType::CHAR || valuetype->type == ValueType::WCHAR_T))
                 tempToken->tokType(Token::eString);
             return;
         }
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -148,6 +148,15 @@ class Variables {
     void clear() {
         mVarUsage.clear();
     }
+    void clearConst() {
+        std::set<int> keys;
+        for (const std::pair<const nonneg int, Variables::VariableUsage>& var : mVarUsage) {
+            if (var.second._var && var.second._var->isConst())
+                keys.emplace(var.first);
+        }
+        for (const int key : keys)
+            mVarUsage.erase(key);
+    }
     const std::map<nonneg int, VariableUsage> &varUsage() const {
         return mVarUsage;
     }
@@ -796,9 +805,8 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
         // templates
         if (tok->isName() && endsWith(tok->str(), '>')) {
             // TODO: This is a quick fix to handle when constants are used
-            // as template parameters. Try to handle this better, perhaps
-            // only remove constants.
-            variables.clear();
+            // as template parameters.
+            variables.clearConst();
         }
 
         else if (Token::Match(tok->previous(), "[;{}]")) {
diff --git a/lib/config.h b/lib/config.h
@@ -161,12 +161,16 @@
 #define HAS_THREADING_MODEL_THREAD
 #define STDCALL __stdcall
 #elif ((defined(__GNUC__) || defined(__sun)) && !defined(__MINGW32__)) || defined(__CPPCHECK__)
+#if !defined(DISALLOW_PROCESS_EXECUTOR)
 #define HAS_THREADING_MODEL_FORK
+#endif
 #if !defined(DISALLOW_THREAD_EXECUTOR)
 #define HAS_THREADING_MODEL_THREAD
 #endif
 #define STDCALL
-#else
+#endif
+
+#if !defined(HAS_THREADING_MODEL_FORK) && !defined(HAS_THREADING_MODEL_THREAD)
 #error "No threading model defined"
 #endif
 
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -210,11 +210,10 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings
     return ImportProject::Type::FAILURE;
 }
 
-static std::string readUntil(const std::string &command, std::string::size_type *pos, const char until[])
+static std::string readUntil(const std::string &command, std::string::size_type *pos, const char until[], bool str = false)
 {
     std::string ret;
     bool escapedString = false;
-    bool str = false;
     bool escape = false;
     for (; *pos < command.size() && (str || !std::strchr(until, command[*pos])); (*pos)++) {
         if (escape)
@@ -266,6 +265,13 @@ void ImportProject::fsParseCommand(FileSettings& fs, const std::string& command,
             pos++;
         if (pos >= command.size())
             break;
+        bool wholeArgQuoted = false;
+        if (command[pos] == '"') {
+            wholeArgQuoted = true;
+            pos++;
+            if (pos >= command.size())
+                break;
+        }
         if (command[pos] != '/' && command[pos] != '-')
             continue;
         pos++;
@@ -276,7 +282,9 @@ void ImportProject::fsParseCommand(FileSettings& fs, const std::string& command,
             while (pos < command.size() && command[pos] == ' ')
                 ++pos;
         }
-        std::string fval = readUntil(command, &pos, " =");
+        std::string fval = readUntil(command, &pos, " =", wholeArgQuoted);
+        if (wholeArgQuoted && fval.back() == '\"')
+            fval.resize(fval.size() - 1);
         if (F=='D') {
             std::string defval = readUntil(command, &pos, " ");
             defs += fval;
diff --git a/releasenotes.txt b/releasenotes.txt
@@ -43,5 +43,6 @@ Infrastructure & dependencies:
 - The official Windows binary is now built against Boost 1.89 for increased performance.
 - Updated to simplecpp 1.6.2
 - The Visual Studio builds not longer set the `WIN32` define.
+- Added `DISALLOW_PROCESS_EXECUTOR` for building without fork().
 
 The changes focus heavily on stability (crash fixes), C/C++ compatibility, reducing false positives, and improving performance.
diff --git a/test/test64bit.cpp b/test/test64bit.cpp
@@ -313,6 +313,23 @@ class Test64BitPortability : public TestFixture {
               "    return x.get();\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int f(int* p) {\n" // #14294
+              "    return (int)p;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:5]: (portability) Returning an address value in a function with integer return type is not portable. [CastAddressToIntegerAtReturn]\n",
+                      errout_str());
+
+        check("int f(int* p) {\n"
+              "    return reinterpret_cast<int>(p);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:5]: (portability) Returning an address value in a function with integer return type is not portable. [CastAddressToIntegerAtReturn]\n",
+                      errout_str());
+
+        check("bool f(const int* p) {\n"
+              "    return p;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/testimportproject.cpp b/test/testimportproject.cpp
@@ -66,6 +66,7 @@ class TestImportProject : public TestFixture {
         TEST_CASE(importCompileCommands12); // #13040: "directory" is parent directory, relative include paths
         TEST_CASE(importCompileCommands13); // #13333: duplicate file entries
         TEST_CASE(importCompileCommands14); // #14156
+        TEST_CASE(importCompileCommands15); // #14306
         TEST_CASE(importCompileCommandsArgumentsSection); // Handle arguments section
         TEST_CASE(importCompileCommandsNoCommandSection); // gracefully handles malformed json
         TEST_CASE(importCompileCommandsDirectoryMissing); // 'directory' field missing
@@ -389,6 +390,26 @@ class TestImportProject : public TestFixture {
         ASSERT_EQUALS("TFS_LINUX_MODULE_NAME=\"tfs_linux\"", fs.defines);
     }
 
+    void importCompileCommands15() const { // #14306
+        REDIRECT;
+        constexpr char json[] =
+            R"([
+                 {
+                   "directory": "C:\\Users\\abcd\\efg\\hijk",
+                   "command": "gcc \"-Ipath\\123\" \"-c\" test.c",
+                   "file": "test.c",
+                   "output": "test.obj"
+                 }
+               ])";
+        std::istringstream istr(json);
+        TestImporter importer;
+        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(1, importer.fileSettings.size());
+        const FileSettings &fs = importer.fileSettings.front();
+        ASSERT_EQUALS(1, fs.includePaths.size());
+        ASSERT_EQUALS("C:/Users/abcd/efg/hijk/path/123/", fs.includePaths.front());
+    }
+
     void importCompileCommandsArgumentsSection() const {
         REDIRECT;
         constexpr char json[] = "[ { \"directory\": \"/tmp/\","
diff --git a/test/testio.cpp b/test/testio.cpp
@@ -2186,6 +2186,12 @@ class TestIO : public TestFixture {
               "    scanf(\"%i\", \"abc\" + 1);\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %i in format string (no. 1) requires 'int *' but the argument type is 'const char *'.\n", errout_str());
+
+        check("struct S { unsigned char a[1]; };" // #14302
+              "void f(S s) {\n"
+              "    scanf(\"%hhu\", s.a);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testPrintfArgument() {
diff --git a/test/testother.cpp b/test/testother.cpp
diff --git a/test/testprocessexecutor.cpp b/test/testprocessexecutor.cpp
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
