From 38c434f83b142c6178881a281ad428febe4905bb Mon Sep 17 00:00:00 2001 From: chrchr-github Date: Thu, 29 Oct 2026 20:39:48 +0100 Subject: [PATCH 1/2] Fix #15077 FP uninitvar for array of std::vector --- lib/valueflow.cpp | 2 +- test/testuninitvar.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp index 4be7a13dbc7..ed5e25c791d 100644 --- a/lib/valueflow.cpp +++ b/lib/valueflow.cpp @@ -5944,7 +5944,7 @@ static bool needsInitialization(const Variable* var) return true; if (var->valueType()->type == ValueType::Type::ITERATOR) return true; - if (var->isStlType() && var->isArray()) { + if (var->isStlType() && var->getTypeName() == "std::array") { if (const Token* ctt = var->valueType()->containerTypeToken) { if (ctt->isStandardType()) return true; diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp index 57940b1b3fd..4d1a913ed3a 100644 --- a/test/testuninitvar.cpp +++ b/test/testuninitvar.cpp @@ -6840,6 +6840,12 @@ class TestUninitVar : public TestFixture { " return a[0];\n" "}\n"); ASSERT_EQUALS("", errout_str()); + + valueFlowUninit("std::vector f() {\n" // #15077 + " const std::vector a[1];\n" + " return a[0];\n" + "}\n"); + ASSERT_EQUALS("", errout_str()); } void valueFlowUninitBreak() { // Do not show duplicate warnings about the same uninitialized value From d112a5fef335cc08449843995582d5c909026b77 Mon Sep 17 00:00:00 2001 From: chrchr-github Date: Thu, 29 Oct 2026 20:40:07 +0100 Subject: [PATCH 2/2] Use getTypeName() --- lib/checkclass.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp index 223bde3b452..858bf81cf54 100644 --- a/lib/checkclass.cpp +++ b/lib/checkclass.cpp @@ -1675,18 +1675,9 @@ void CheckClassImpl::checkMemsetType(const Scope *start, const Token *tok, const } // don't warn if variable static or const, pointer or array of pointers if (!var.isStatic() && !var.isConst() && !var.isPointer() && (!var.isArray() || var.typeEndToken()->str() != "*")) { - const Token *tok1 = var.typeStartToken(); const Scope *typeScope = var.typeScope(); - std::string typeName; - if (Token::Match(tok1, "%type% ::")) { - const Token *typeTok = tok1; - while (Token::Match(typeTok, "%type% ::")) { - typeName += typeTok->str() + "::"; - typeTok = typeTok->tokAt(2); - } - typeName += typeTok->str(); - } + const std::string typeName = var.getTypeName(); // check for std:: type if (var.isStlType() && typeName != "std::array" && !mSettings.library.podtype(typeName)) {