Merge branch 'main' of https://github.com/danmar/cppcheck into main

lib/checkfunctions.cpp

@@ -154,7 +154,7 @@ void CheckFunctions::invalidFunctionArgError(const Token *tok, const std::string
         errmsg << " The value is 0 or 1 (boolean) but the valid values are '" << validstr << "'.";
     if (invalidValue)
         reportError(getErrorPath(tok, invalidValue, "Invalid argument"),
-                    invalidValue->errorSeverity() ? Severity::error : Severity::warning,
+                    invalidValue->errorSeverity() && invalidValue->isKnown() ? Severity::error : Severity::warning,
                     "invalidFunctionArg",
                     errmsg.str(),
                     CWE628,

lib/checkuninitvar.cpp

@@ -196,6 +196,8 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
 void CheckUninitVar::checkStruct(const Token *tok, const Variable &structvar)
 {
     const Token *typeToken = structvar.typeStartToken();
+    while (Token::Match(typeToken, "%name% ::"))
+        typeToken = typeToken->tokAt(2);
     const SymbolDatabase * symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope2 : symbolDatabase->classAndStructScopes) {
         if (scope2->className == typeToken->str() && scope2->numConstructors == 0U) {

test/testfunctions.cpp

@@ -464,6 +464,44 @@ private:
 
         check("void f() { strtol(a,b,10); }");
         ASSERT_EQUALS("", errout.str());
+
+        check("void f(std::vector<int>& v) {\n" //  #10754
+              "    int N = -1;\n"
+              "    for (long i = 0; i < g(); i++)\n"
+              "        N = h(N);\n"
+              "    v.resize(N);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5]: (warning) Invalid v.resize() argument nr 1. The value is -1 but the valid values are '0:'.\n", errout.str());
+
+        check("void f(std::vector<int>& v, int N) {\n"
+              "    if (N < -1)\n"
+              "        return;\n"
+              "    v.resize(N);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (warning) Either the condition 'N<-1' is redundant or v.resize() argument nr 1 can have invalid value. The value is -1 but the valid values are '0:'.\n",
+                      errout.str());
+
+        check("void f(std::vector<int>& v, int N) {\n"
+              "    if (N == -1) {}\n"
+              "    v.resize(N);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition 'N==-1' is redundant or v.resize() argument nr 1 can have invalid value. The value is -1 but the valid values are '0:'.\n",
+                      errout.str());
+
+        check("void f(std::vector<int>& v, int N, bool b) {\n"
+              "    if (b)\n"
+              "        N = -1;\n"
+              "    v.resize(N);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4]: (warning) Invalid v.resize() argument nr 1. The value is -1 but the valid values are '0:'.\n",
+                      errout.str());
+
+        check("void f(std::vector<int>& v) {\n"
+              "    int N = -1;\n"
+              "    v.resize(N);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid v.resize() argument nr 1. The value is -1 but the valid values are '0:'.\n",
+                      errout.str());
     }
 
     void invalidFunctionUsageStrings() {

test/testuninitvar.cpp

@@ -6052,6 +6052,55 @@ private:
                         "    if ((&a)->bar) ;\n"
                         "}");
         ASSERT_EQUALS("", errout.str());
+
+        valueFlowUninit("struct A {\n" // #10200
+                        "    struct B {\n"
+                        "        int i;\n"
+                        "    };\n"
+                        "    int j;\n"
+                        "};\n"
+                        "void f(std::vector<A::B>& x) {\n"
+                        "    A::B b;\n"
+                        "    b.i = 123;\n"
+                        "    x.push_back(b);\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout.str());
+
+        valueFlowUninit("struct A {\n"
+                        "    struct B {\n"
+                        "        int i;\n"
+                        "    };\n"
+                        "    int j;\n"
+                        "};\n"
+                        "void f(std::vector<A::B>& x) {\n"
+                        "    A::B b;\n"
+                        "    x.push_back(b);\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:9]: (error) Uninitialized variable: b\n", errout.str());
+
+        valueFlowUninit("struct A {\n"
+                        "    struct B {\n"
+                        "        int i;\n"
+                        "    };\n"
+                        "    int j;\n"
+                        "};\n"
+                        "void f(std::vector<A>&x) {\n"
+                        "    A a;\n"
+                        "    a.j = 123;\n"
+                        "    x.push_back(a);\n"
+                        "}\n");
+
+        valueFlowUninit("struct A {\n"
+                        "    struct B {\n"
+                        "        int i;\n"
+                        "    };\n"
+                        "    int j;\n"
+                        "};\n"
+                        "void f(std::vector<A>& x) {\n"
+                        "    A a;\n"
+                        "    x.push_back(a);\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:9]: (error) Uninitialized variable: a\n", errout.str());
     }
 
     void ctu_(const char* file, int line, const char code[]) {