Merge branch 'main' into chr_Fix11093

.github/workflows/CI-unixish-docker.yml

@@ -53,8 +53,10 @@ jobs:
       # needs to be called after the package installation since
       # - it doesn't call "apt-get update"
       # - it doesn't support centos
+      #
+      # needs to be to fixated on 1.2.11 so it works with older images - see https://github.com/hendrikmuhs/ccache-action/issues/178
       - name: ccache
-        uses: hendrikmuhs/[email protected]
+        uses: hendrikmuhs/[email protected].11
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
 
@@ -110,8 +112,10 @@ jobs:
       # needs to be called after the package installation since
       # - it doesn't call "apt-get update"
       # - it doesn't support centos
+      #
+      # needs to be to fixated on 1.2.11 so it works with older images - see https://github.com/hendrikmuhs/ccache-action/issues/178
       - name: ccache
-        uses: hendrikmuhs/[email protected]
+        uses: hendrikmuhs/[email protected].11
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
 

cfg/windows.cfg

@@ -17958,6 +17958,46 @@ HFONT CreateFont(
   <define name="UNREFERENCED_PARAMETER(P)" value="((void)(P))"/>
   <define name="DBG_UNREFERENCED_PARAMETER(P)" value="((void)(P))"/>
   <define name="DBG_UNREFERENCED_LOCAL_VARIABLE(P)" value="((void)(P))"/>
+  <!-- winreg.h -->
+  <define name="REG_OPTION_BACKUP_RESTORE" value="0x00000004L"/>
+  <define name="REG_OPTION_CREATE_LINK" value="0x00000002L"/>
+  <define name="REG_OPTION_NON_VOLATILE" value="0x00000000L"/>
+  <define name="REG_OPTION_VOLATILE" value="0x00000001L"/>
+  <define name="REG_CREATED_NEW_KEY" value="0x00000001L"/>
+  <define name="REG_OPENED_EXISTING_KEY" value="0x00000002L"/>
+  <define name="SHUTDOWN_FORCE_OTHERS" value="0x00000001"/>
+  <define name="SHUTDOWN_FORCE_SELF" value="0x00000002"/>
+  <define name="SHUTDOWN_GRACE_OVERRIDE" value="0x00000020"/>
+  <define name="SHUTDOWN_HYBRID" value="0x00000200"/>
+  <define name="SHUTDOWN_INSTALL_UPDATES" value="0x00000040"/>
+  <define name="SHUTDOWN_NOREBOOT" value="0x00000010"/>
+  <define name="SHUTDOWN_POWEROFF" value="0x00000008"/>
+  <define name="SHUTDOWN_RESTART" value="0x00000004"/>
+  <define name="SHUTDOWN_RESTARTAPPS" value="0x00000080"/>
+  <define name="KEY_WOW64_32KEY" value="0x0200"/>
+  <define name="KEY_WOW64_64KEY" value="0x0100"/>
+  <define name="RRF_RT_ANY" value="0x0000ffff"/>
+  <define name="RRF_RT_DWORD" value="0x00000018"/>
+  <define name="RRF_RT_QWORD" value="0x00000048"/>
+  <define name="RRF_RT_REG_BINARY" value="0x00000008"/>
+  <define name="RRF_RT_REG_DWORD" value="0x00000010"/>
+  <define name="RRF_RT_REG_EXPAND_SZ" value="0x00000004"/>
+  <define name="RRF_RT_REG_MULTI_SZ" value="0x00000020"/>
+  <define name="RRF_RT_REG_NONE" value="0x00000001"/>
+  <define name="RRF_RT_REG_QWORD" value="0x00000040"/>
+  <define name="RRF_RT_REG_SZ" value="0x00000002"/>
+  <define name="RRF_NOEXPAND" value="0x10000000"/>
+  <define name="RRF_ZEROONFAILURE" value="0x20000000"/>
+  <define name="RRF_SUBKEY_WOW6464KEY" value="0x00010000"/>
+  <define name="RRF_SUBKEY_WOW6432KEY" value="0x00020000"/>
+  <define name="REG_MUI_STRING_TRUNCATE" value="0x00000001"/>
+  <define name="REG_NOTIFY_CHANGE_NAME" value="0x00000001L"/>
+  <define name="REG_NOTIFY_CHANGE_ATTRIBUTES" value="0x00000002L"/>
+  <define name="REG_NOTIFY_CHANGE_LAST_SET" value="0x00000004L"/>
+  <define name="REG_NOTIFY_CHANGE_SECURITY" value="0x00000008L"/>
+  <define name="REG_NOTIFY_THREAD_AGNOSTIC" value="0x10000000L"/>
+  <define name="REG_FORCE_RESTORE" value="0x00000008L"/>
+  <define name="REG_WHOLE_HIVE_VOLATILE" value="0x00000001L"/>
   <!-- https://learn.microsoft.com/en-us/cpp/build/reference/entry-entry-point-symbol -->
   <entrypoint name="mainCRTStartup"/>
   <entrypoint name="WinMain"/>

gui/resultstree.cpp

@@ -421,7 +421,7 @@ void ResultsTree::loadSettings()
     mSaveAllErrors = mSettings->value(SETTINGS_SAVE_ALL_ERRORS, false).toBool();
     mShowFullPath = mSettings->value(SETTINGS_SHOW_FULL_PATH, false).toBool();
 
-    showIdColumn(mSettings->value(SETTINGS_SHOW_ERROR_ID, false).toBool());
+    showIdColumn(mSettings->value(SETTINGS_SHOW_ERROR_ID, true).toBool());
     showInconclusiveColumn(mSettings->value(SETTINGS_INCONCLUSIVE_ERRORS, false).toBool());
 }
 

gui/settingsdialog.cpp

@@ -73,7 +73,7 @@ SettingsDialog::SettingsDialog(ApplicationList *list,
     mUI->mInlineSuppressions->setCheckState(boolToCheckState(settings.value(SETTINGS_INLINE_SUPPRESSIONS, false).toBool()));
     mUI->mEnableInconclusive->setCheckState(boolToCheckState(settings.value(SETTINGS_INCONCLUSIVE_ERRORS, false).toBool()));
     mUI->mShowStatistics->setCheckState(boolToCheckState(settings.value(SETTINGS_SHOW_STATISTICS, false).toBool()));
-    mUI->mShowErrorId->setCheckState(boolToCheckState(settings.value(SETTINGS_SHOW_ERROR_ID, false).toBool()));
+    mUI->mShowErrorId->setCheckState(boolToCheckState(settings.value(SETTINGS_SHOW_ERROR_ID, true).toBool()));
     mUI->mCheckForUpdates->setCheckState(boolToCheckState(settings.value(SETTINGS_CHECK_FOR_UPDATES, false).toBool()));
     mUI->mEditPythonPath->setText(settings.value(SETTINGS_PYTHON_PATH, QString()).toString());
     validateEditPythonPath();

lib/checkstl.cpp

@@ -718,7 +718,7 @@ static bool isSameIteratorContainerExpression(const Token* tok1,
             });
         });
     }
-    return false;
+    return astContainerYield(tok2) == Library::Container::Yield::ITEM;
 }
 
 static ValueFlow::Value getLifetimeIteratorValue(const Token* tok, MathLib::bigint path = 0)
@@ -884,6 +884,8 @@ void CheckStl::mismatchingContainerIterator()
                 continue;
             if (val.lifetimeKind != ValueFlow::Value::LifetimeKind::Iterator)
                 continue;
+            if (iterTok->str() == "*" && iterTok->astOperand1()->valueType() && iterTok->astOperand1()->valueType()->type == ValueType::ITERATOR)
+                continue;
             if (isSameIteratorContainerExpression(tok, val.tokvalue, mSettings->library))
                 continue;
             mismatchingContainerIteratorError(tok, iterTok, val.tokvalue);

lib/library.cpp

@@ -434,7 +434,9 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
             const char* const startPattern = node->Attribute("startPattern");
             if (startPattern) {
                 container.startPattern = startPattern;
-                container.startPattern2 = container.startPattern + " !!::";
+                container.startPattern2 = startPattern;
+                if (!endsWith(container.startPattern, '<'))
+                    container.startPattern2 += " !!::";
             }
             const char* const endPattern = node->Attribute("endPattern");
             if (endPattern)

lib/symboldatabase.cpp

@@ -2874,7 +2874,7 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
             if (second)
                 second = second->tokAt(-2);
             if (!second) { // End of argument list (second)
-                return false;
+                return !first->nextArgument();
             }
         }
 

lib/valueflow.cpp

@@ -1105,6 +1105,53 @@ static void setTokenValueCast(Token *parent, const ValueType &valueType, const V
     }
 }
 
+template<class F>
+static size_t accumulateStructMembers(const Scope* scope, F f)
+{
+    size_t total = 0;
+    for (const Variable& var : scope->varlist) {
+        if (var.isStatic())
+            continue;
+        if (const ValueType* vt = var.valueType()) {
+            if (vt->type == ValueType::Type::RECORD && vt->typeScope == scope)
+                return 0;
+            total = f(total, *vt);
+        }
+        if (total == 0)
+            return 0;
+    }
+    return total;
+}
+
+static size_t bitCeil(size_t x)
+{
+    if (x <= 1)
+        return 1;
+    --x;
+    x |= x >> 1;
+    x |= x >> 2;
+    x |= x >> 4;
+    x |= x >> 8;
+    x |= x >> 16;
+    x |= x >> 32;
+    return x + 1;
+}
+
+static size_t getAlignOf(const ValueType& vt, const Settings& settings)
+{
+    if (vt.pointer || vt.isPrimitive()) {
+        auto align = ValueFlow::getSizeOf(vt, settings);
+        return align == 0 ? 0 : bitCeil(align);
+    }
+    if (vt.type == ValueType::Type::RECORD && vt.typeScope) {
+        return accumulateStructMembers(vt.typeScope, [&](size_t max, const ValueType& vt2) {
+            size_t a = getAlignOf(vt2, settings);
+            return std::max(max, a);
+        });
+    }
+    return 0;
+}
+
 static nonneg int getSizeOfType(const Token *typeTok, const Settings &settings)
 {
     const ValueType &valueType = ValueType::parseDecl(typeTok, settings);
@@ -1134,7 +1181,23 @@ size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings &settings)
         return settings.platform.sizeof_double;
     if (vt.type == ValueType::Type::LONGDOUBLE)
         return settings.platform.sizeof_long_double;
-
+    if (vt.type == ValueType::Type::RECORD && vt.typeScope) {
+        size_t total = accumulateStructMembers(vt.typeScope, [&](size_t total, const ValueType& vt2) -> size_t {
+            size_t n = ValueFlow::getSizeOf(vt2, settings);
+            size_t a = getAlignOf(vt2, settings);
+            if (n == 0 || a == 0)
+                return 0;
+            size_t padding = (a - (total % a)) % a;
+            return total + padding + n;
+        });
+        if (total == 0)
+            return 0;
+        size_t align = getAlignOf(vt, settings);
+        if (align == 0)
+            return 0;
+        total += (align - (total % align)) % align;
+        return total;
+    }
     return 0;
 }
 

test/cfg/std.cpp

@@ -4925,6 +4925,13 @@ std::string global_scope_std() // #12355
     return ss.str();
 }
 
+::std::size_t global_scope_std2() // #12378
+{
+    std::vector<::std::size_t> v;
+    // cppcheck-suppress containerOutOfBounds
+    return v.front();
+}
+
 void unique_lock_const_ref(std::mutex& m)
 {
     std::unique_lock lock(m);

test/testclass.cpp

@@ -8530,6 +8530,16 @@ class TestClass : public TestFixture {
                       "};\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:8]: (style) The function 'operator->' overrides a function in a base class but is not marked with a 'override' specifier.\n",
                       errout.str());
+
+        checkOverride("class Base {\n" // #12131
+                      "    virtual int Calculate(int arg) = 0;\n"
+                      "};\n"
+                      "class Derived : public Base {\n"
+                      "    int Calculate(int arg = 0) {\n"
+                      "        return arg * 2;\n"
+                      "    }\n"
+                      "};\n");
+        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:5]: (style) The function 'Calculate' overrides a function in a base class but is not marked with a 'override' specifier.\n", errout.str());
     }
 
     void overrideCVRefQualifiers() {

test/teststl.cpp

@@ -2180,6 +2180,32 @@ class TestStl : public TestFixture {
               "    }\n"
               "};\n");
         ASSERT_EQUALS("", errout.str());
+
+        // #11067
+        check("struct S {\n"
+              "    std::vector<int> v;\n"
+              "    std::list<std::vector<int>::const_iterator> li;\n"
+              "    void f();\n"
+              "};\n"
+              "void S::f() {\n"
+              "    v.erase(*li.begin());\n"
+              "    li.pop_front();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+
+        check("void f(std::set<std::string>& a, std::stack<std::set<std::string>::iterator>& b) {\n"
+              "    while (!b.empty()) {\n"
+              "        a.erase(b.top());\n"
+              "        b.pop();\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+
+        check("void f(std::vector<int>& a, std::vector<std::vector<int>::iterator>& b) {\n"
+              "    auto it = b.begin();\n"
+              "    a.erase(*it);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     // Dereferencing invalid pointer

test/testsymboldatabase.cpp

@@ -8775,35 +8775,33 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             // Container
-            Settings sC;
-            Library::Container c;
-            c.startPattern = "C";
-            c.startPattern2 = "C !!::";
-            sC.library.containers["C"] = c;
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <container id=\"C\" startPattern=\"C\"/>\n"
+                                       "</def>";
+            const Settings sC = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
             ASSERT_EQUALS("container(C) *", typeOf("C*c=new C;","new","test.cpp",&sC));
             ASSERT_EQUALS("container(C) *", typeOf("x=(C*)c;","(","test.cpp",&sC));
             ASSERT_EQUALS("container(C)", typeOf("C c = C();","(","test.cpp",&sC));
         }
         {
             // Container (vector)
-            Settings set;
-            Library::Container vector;
-            vector.startPattern = "Vector <";
-            vector.startPattern2 = "Vector !!::";
-            vector.type_templateArgNo = 0;
-            vector.arrayLike_indexOp = true;
-            vector.functions["front"] =
-                Library::Container::Function{Library::Container::Action::NO_ACTION, Library::Container::Yield::ITEM};
-            vector.functions["data"] =
-                Library::Container::Function{Library::Container::Action::NO_ACTION, Library::Container::Yield::BUFFER};
-            vector.functions["begin"] = Library::Container::Function{Library::Container::Action::NO_ACTION,
-                                                                     Library::Container::Yield::START_ITERATOR};
-            set.library.containers["Vector"] = vector;
-            Library::Container string;
-            string.startPattern = "test :: string";
-            string.startPattern2 = "test :: string !!::";
-            string.arrayLike_indexOp = string.stdStringLike = true;
-            set.library.containers["test::string"] = string;
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <container id=\"Vector\" startPattern=\"Vector &lt;\">\n"
+                                       "    <type templateParameter=\"0\"/>\n"
+                                       "    <access indexOperator=\"array-like\">\n"
+                                       "      <function name=\"front\" yields=\"item\"/>\n"
+                                       "      <function name=\"data\" yields=\"buffer\"/>\n"
+                                       "      <function name=\"begin\" yields=\"start-iterator\"/>\n"
+                                       "    </access>\n"
+                                       "  </container>\n"
+                                       "  <container id=\"test::string\" startPattern=\"test :: string\">\n"
+                                       "    <type string=\"std-like\"/>\n"
+                                       "    <access indexOperator=\"array-like\"/>\n"
+                                       "  </container>\n"
+                                       "</def>";
+            const Settings set = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
             ASSERT_EQUALS("signed int", typeOf("Vector<int> v; v[0]=3;", "[", "test.cpp", &set));
             ASSERT_EQUALS("container(test :: string)", typeOf("{return test::string();}", "(", "test.cpp", &set));
             ASSERT_EQUALS(
@@ -8876,11 +8874,11 @@ class TestSymbolDatabase : public TestFixture {
         // return
         {
             // Container
-            Settings sC;
-            Library::Container c;
-            c.startPattern = "C";
-            c.startPattern2 = "C !!::";
-            sC.library.containers["C"] = c;
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <container id=\"C\" startPattern=\"C\"/>\n"
+                                       "</def>";
+            const Settings sC = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
             ASSERT_EQUALS("container(C)", typeOf("C f(char *p) { char data[10]; return data; }", "return", "test.cpp", &sC));
         }
         // Smart pointer