Merge

.github/workflows/CI-unixish.yml

@@ -392,7 +392,7 @@ jobs:
         run: |
           ./cppcheck --error-exitcode=1 --inline-suppr --addon=threadsafety addons/test/threadsafety
           ./cppcheck --error-exitcode=1 --inline-suppr --addon=threadsafety --std=c++03 addons/test/threadsafety
-          ./cppcheck --error-exitcode=1 --addon=misra addons/test/misra/crash*.c
+          ./cppcheck --error-exitcode=1 --inline-suppr --addon=misra addons/test/misra/crash*.c
           ./cppcheck --addon=misra --enable=style --inline-suppr --enable=information --error-exitcode=1 addons/test/misra/misra-ctu-*-test.c
           pushd addons/test
           # We'll force C89 standard to enable an additional verification for

.github/workflows/asan.yml

@@ -39,6 +39,7 @@ jobs:
 
       - name: Install clang
         run: |
+          sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 16

.github/workflows/clang-tidy.yml

@@ -27,6 +27,7 @@ jobs:
 
       - name: Install clang
         run: |
+          sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 16

.github/workflows/iwyu.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     container:
-      image: "archlinux:latest"
+      image: "fedora:latest"
 
     steps:
       - uses: actions/checkout@v3
@@ -34,15 +34,23 @@ jobs:
           pacman -Sy
           pacman -S cmake make gcc qt5-base qt5-tools qt5-charts pcre wget --noconfirm
           pacman-key --init
-          pacman-key --recv-key FBA220DFC880C036 --keyserver keyserver.ubuntu.com
-          pacman-key --lsign-key FBA220DFC880C036
+          pacman-key --recv-key 3056513887B78AEB  --keyserver keyserver.ubuntu.com
+          pacman-key --lsign-key 3056513887B78AEB 
           pacman -U 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst' --noconfirm
           echo "[chaotic-aur]" >> /etc/pacman.conf
           echo "Include = /etc/pacman.d/chaotic-mirrorlist" >> /etc/pacman.conf
           pacman -Sy
           pacman -S include-what-you-use --noconfirm
           ln -s iwyu-tool /usr/sbin/iwyu_tool
 
+      # TODO: the necessary packages are excessive - mostly because of Qt - use a pre-built image
+      - name: Install missing software on Fedora
+        run: |
+          dnf install -y cmake gcc-c++ qt5-qtbase-devel qt5-linguist qt5-qttools-devel qt5-qtcharts-devel pcre-devel
+          dnf install -y wget iwyu
+          ln -s iwyu_tool.py /usr/bin/iwyu_tool
+          ln -s qt5 /usr/include/qt
+
       - name: Prepare CMake
         run: |
           cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off
@@ -107,6 +115,7 @@ jobs:
 
       - name: Install clang
         run: |
+          sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 17

.github/workflows/scriptcheck.yml

@@ -37,12 +37,11 @@ jobs:
 
     needs: build
     # 'ubuntu-22.04' removes Python 2.7, 3.5 and 3.6 so keep the previous LTS version
+    # 'ubutunu-20.04' no longer works on 2.7 - TODO: re-added in a different way or remove support for it?
     runs-on: ubuntu-20.04
-        container:
-            image: python:2.7.18-buster
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
       fail-fast: false
 
     steps:

.github/workflows/tsan.yml

@@ -39,6 +39,7 @@ jobs:
 
       - name: Install clang
         run: |
+          sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 16

.github/workflows/ubsan.yml

@@ -39,6 +39,7 @@ jobs:
 
       - name: Install clang
         run: |
+          sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 16

AUTHORS

@@ -315,6 +315,7 @@ Ryan Pavlik
 Samir Aguiar
 Sam Truscott
 Samuel Degrande
+Samuel Poláček
 Sandeep Dutta
 Savvas Etairidis
 Scott Furry

Makefile

@@ -667,7 +667,7 @@ cli/stacktrace.o: cli/stacktrace.cpp cli/stacktrace.h lib/config.h lib/utils.h
 cli/threadexecutor.o: cli/threadexecutor.cpp cli/cppcheckexecutor.h cli/executor.h cli/threadexecutor.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/threadexecutor.cpp
 
-test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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 test/fixture.h test/options.h test/redirect.h
+test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h test/options.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/fixture.cpp
 
 test/helpers.o: test/helpers.cpp externals/simplecpp/simplecpp.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/helpers.h
@@ -862,7 +862,7 @@ test/testunusedprivfunc.o: test/testunusedprivfunc.cpp externals/simplecpp/simpl
 test/testunusedvar.o: test/testunusedvar.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkunusedvar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedvar.cpp
 
-test/testutils.o: test/testutils.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.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
+test/testutils.o: test/testutils.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testutils.cpp
 
 test/testvaarg.o: test/testvaarg.cpp lib/check.h lib/checkvaarg.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h

addons/misra_9.py

@@ -1,3 +1,5 @@
+import cppcheckdata
+
 # Holds information about an array, struct or union's element definition.
 class ElementDef:
     def __init__(self, elementType, name, valueType, dimensions = None):
@@ -30,7 +32,7 @@ def __repr__(self):
 
         attrs = ["childIndex", "elementType", "valueType"]
         return "{}({}, {}, {})".format(
-            "ED",
+            "ElementDef",
             self.getLongName(),
             inits,
             ", ".join(("{}={}".format(a, repr(getattr(self, a))) for a in attrs))
@@ -253,6 +255,16 @@ def parseInitializer(self, root, token):
                 isFirstElement = False
                 isDesignated = True
 
+            elif self.token.isString and self.ed and self.ed.isArray:
+                self.ed.setInitialized(isDesignated)
+                if self.token == self.token.astParent.astOperand1 and self.token.astParent.astOperand2:
+                    self.token = self.token.astParent.astOperand2
+                    self.ed.markAsCurrent()
+                    self.ed = self.root.getNextChild()
+                else:
+                    self.unwindAndContinue()
+                continue
+
             elif self.token.str == '{':
                 nextChild = self.root.getNextChild() if self.root is not None else None
 
@@ -314,6 +326,7 @@ def parseInitializer(self, root, token):
                             else:
                                 self.ed.parent.setInitialized(isDesignated)
                             self.ed.parent.initializeChildren()
+
                     else:
                         if self.ed.parent != self.root:
                             # Check if token is correct value type for self.root.children[?]
@@ -333,6 +346,8 @@ def parseInitializer(self, root, token):
                         parent = parent.parent
                     isDesignated = False
 
+                    if self.token.isString and self.ed.parent.isArray:
+                        self.ed = self.ed.parent
                 self.unwindAndContinue()
 
     def pushToRootStackAndMarkAsDesignated(self):
@@ -381,6 +396,39 @@ def unwindAndContinue(self):
                     break
 
 def misra_9_x(self, data, rule, rawTokens = None):
+    # If there are arrays with unknown size constants then we need to warn about missing configuration
+    # and bailout
+    has_config_errors = False
+    for var in data.variables:
+        if not var.isArray or var.nameToken is None or not cppcheckdata.simpleMatch(var.nameToken.next,'['):
+            continue
+        tok = var.nameToken.next
+        while tok.str == '[':
+            sz = tok.astOperand2
+            if sz and sz.getKnownIntValue() is None:
+                has_var = False
+                unknown_constant = False
+                tokens = [sz]
+                while len(tokens) > 0:
+                    t = tokens[-1]
+                    tokens = tokens[:-1]
+                    if t:
+                        if t.isName and t.getKnownIntValue() is None:
+                            if t.varId or t.variable:
+                                has_var = True
+                                continue
+                            unknown_constant = True
+                            cppcheckdata.reportError(sz, 'error', 'Unknown constant {}, please review configuration'.format(t.str), 'misra', 'config')
+                            has_config_errors = True
+                        if t.isArithmeticalOp:
+                            tokens += [t.astOperand1, t.astOperand2]
+                if not unknown_constant and not has_var:
+                    cppcheckdata.reportError(sz, 'error', 'Unknown array size, please review configuration', 'misra', 'config')
+                    has_config_errors = True
+            tok = tok.link.next
+    if has_config_errors:
+        return
+
     parser = InitializerParser()
 
     for variable in data.variables:
@@ -476,6 +524,8 @@ def createRecordChildrenDefs(ed, var):
     valueType = ed.valueType
     if not valueType or not valueType.typeScope:
         return
+    if var is None:
+        return
     typeToken = var.typeEndToken
     while typeToken and typeToken.isName:
         typeToken = typeToken.previous

addons/test/misra/crash4.c

@@ -0,0 +1,11 @@
+
+struct ConDesDesc {
+    unsigned   Order;
+    unsigned   Import;
+};
+
+// cppcheck-suppress misra-config
+static ConDesDesc ConDes[CD_TYPE_COUNT] = {
+    { 0, 0 },
+    { 0, 0 },
+};

addons/test/misra/crash5.c

@@ -0,0 +1,23 @@
+
+struct _boardcnf_ch {
+    // cppcheck-suppress misra-config
+    uint8_t ddr_density[CS_CNT];
+    uint64_t ca_swap;
+};
+
+struct _boardcnf {
+
+    uint16_t dqdm_dly_r;
+    // cppcheck-suppress misra-config
+    struct _boardcnf_ch ch[DRAM_CH_CNT];
+};
+
+static const struct _boardcnf boardcnfs[1] = {
+    {
+        0x0a0,
+        {
+            { {0x02, 0x02}, 0x00345201 },
+            { {0x02, 0x02}, 0x00302154 }
+        }
+    },
+};

addons/test/misra/crash6.c

@@ -0,0 +1,17 @@
+
+
+typedef	struct _tGames
+{
+    char magicdirname[10];
+    unsigned int expectedmask;
+    unsigned char pictureorder[3];
+} tGames;
+
+static const tGames games[1]={
+    {"Pawn", 1, {0,1,2}}
+};
+
+
+
+
+

addons/test/misra/crash7.c

@@ -0,0 +1,8 @@
+
+
+static const struct id3_frametype wordlist[] =
+{
+  {0, "Encryption method registration"},
+  {1, "Popularimeter"},
+};
+

addons/test/misra/crash8.c

@@ -0,0 +1,10 @@
+
+struct three_d_filter_t {
+  char   name[16];
+  double elem[2];
+};
+
+static three_d_filter_t base_filters[] = {
+  {"Identity", { 1.0, 0.0 } },
+  {"Echo", { 0.4, 0.0 } }
+};

addons/test/misra/crash9.c

@@ -0,0 +1,3 @@
+
+#line 3 "<stdout>"
+typedef int8_t flex_int8_t;

addons/test/misra/misra-test.c

@@ -586,10 +586,6 @@ static void misra_9_struct_initializers(void) {
     struct1 os1 = { i1: 1, i2: 2 }; // 10.4 13.4
 }
 
-static void misra_9_broken_initializers(void) {
-    char a[UNKNOWN_MACRO] = { 19, 23, 0 };             // 18.8
-}
-
 static void misra_9_2(void) {
     union misra_9_2_union {     // 19.2
         char c;

cfg/posix.cfg

@@ -2197,7 +2197,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <leak-ignore/>
     <use-retval/>
     <returnValue type="long int"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <not-bool/>
@@ -2209,7 +2209,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <leak-ignore/>
     <use-retval/>
     <returnValue type="long int"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <not-bool/>
@@ -2221,7 +2221,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <leak-ignore/>
     <use-retval/>
     <returnValue type="double"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <not-bool/>

cfg/std.cfg

@@ -5011,6 +5011,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
+      <minsize type="argvalue" arg="4"/>
       <strz/>
     </arg>
     <arg nr="4" direction="in">
@@ -5096,6 +5097,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
+      <minsize type="argvalue" arg="4"/>
       <strz/>
     </arg>
     <arg nr="4" direction="in">
@@ -5211,6 +5213,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-null/>
       <not-uninit/>
       <strz/>
+      <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="3" direction="in">
       <not-uninit/>

cli/cmdlineparser.cpp

@@ -44,7 +44,6 @@
 #include <list>
 #include <set>
 #include <sstream> // IWYU pragma: keep
-#include <stdexcept>
 #include <unordered_set>
 #include <utility>
 
@@ -53,10 +52,6 @@
 #include <tinyxml2.h>
 #endif
 
-#ifdef __linux__
-#include <unistd.h>
-#endif
-
 static bool addFilesToList(const std::string& fileList, std::vector<std::string>& pathNames)
 {
     std::istream *files;
@@ -1031,7 +1026,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
     else if ((def || mSettings.preprocessOnly) && !maxconfigs)
         mSettings.maxConfigs = 1U;
 
-    if (mSettings.checks.isEnabled(Checks::unusedFunction) && mSettings.jobs > 1) {
+    if (mSettings.checks.isEnabled(Checks::unusedFunction) && mSettings.jobs > 1 && mSettings.buildDir.empty()) {
         printMessage("unusedFunction check can't be used with '-j' option. Disabling unusedFunction check.");
     }
 

cli/cmdlineparser.h

@@ -19,6 +19,7 @@
 #ifndef CMDLINE_PARSER_H
 #define CMDLINE_PARSER_H
 
+#include <cstddef>
 #include <string>
 #include <vector>