From 4968380a6b8e511bb8732a1c034335bf82206517 Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Mon, 16 Nov 2026 10:08:14 +0100 Subject: [PATCH 1/8] Update checkuninitvar.h --- lib/checkuninitvar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/checkuninitvar.h b/lib/checkuninitvar.h index a9156adfe36..2378717be9e 100644 --- a/lib/checkuninitvar.h +++ b/lib/checkuninitvar.h @@ -91,7 +91,7 @@ class CPPCHECKLIB CheckUninitVarImpl : public CheckImpl { enum Alloc : std::uint8_t { NO_ALLOC, NO_CTOR_CALL, CTOR_CALL, ARRAY }; - bool diag(const Token* tok); + bool diag(const Token* tok, bool insert = true); /** Check for uninitialized variables */ void check(); void checkScope(const Scope* scope, const std::set &arrayTypeDefs); From 18a16103bf7e5faed5de7fef31ca00f3b784f293 Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Mon, 16 Nov 2026 10:09:28 +0100 Subject: [PATCH 2/8] Update checkuninitvar.cpp --- lib/checkuninitvar.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp index 4acf003af99..88c355af5d4 100644 --- a/lib/checkuninitvar.cpp +++ b/lib/checkuninitvar.cpp @@ -98,13 +98,15 @@ static std::map getVariableValues(const Token* tok) { return ret; } -bool CheckUninitVarImpl::diag(const Token* tok) +bool CheckUninitVarImpl::diag(const Token* tok, bool insert) { if (!tok) return true; while (Token::Match(tok->astParent(), "*|&|.")) tok = tok->astParent(); - return !mUninitDiags.insert(tok).second; + if (!insert) + return mUninitDiags.find(tok) != mUninitDiags.end(); + return !mUninitDiags.insert(tok).second; } void CheckUninitVarImpl::check() @@ -1620,6 +1622,8 @@ void CheckUninitVarImpl::uninitvarError(const Token* tok, const ValueFlow::Value void CheckUninitVarImpl::uninitStructMemberError(const Token *tok, const std::string &membername) { + if (diag(tok, /*insert*/ false)) + return; reportError(tok, Severity::error, "uninitStructMember", From bfed3a5df44cca8b7cb37961fb4e613e0cf827ab Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Mon, 16 Nov 2026 10:12:32 +0100 Subject: [PATCH 3/8] Update testuninitvar.cpp --- test/testuninitvar.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp index 6e742d31bcc..7429c30ba47 100644 --- a/test/testuninitvar.cpp +++ b/test/testuninitvar.cpp @@ -101,11 +101,13 @@ class TestUninitVar : public TestFixture { TEST_CASE(uninitvar_nonmember); // crash in ycmd test TEST_CASE(uninitvarDesignatedInitializers); TEST_CASE(uninitvarMemberPointer); + TEST_CASE(uninitvarDiag); TEST_CASE(isVariableUsageDeref); // *p TEST_CASE(isVariableUsageDerefValueflow); // *p TEST_CASE(uninitvar_memberaccess); // (&(a))->b <=> a.b + // whole program analysis TEST_CASE(ctuTest); @@ -132,6 +134,17 @@ class TestUninitVar : public TestFixture { checkuninitvar.check(); } +#define checkUninitVarAll(...) checkUninitVarAll_(__FILE__, __LINE__, __VA_ARGS__) + template + void checkUninitVarAll_(const char* file, int line, const char (&code)[size]) { + SimpleTokenizer tokenizer(settings, *this, true); + ASSERT_LOC(tokenizer.tokenize(code), file, line); + + CheckUninitVarImpl checkuninitvar(&tokenizer, settings, *this); + checkuninitvar.valueFlowUninit(); + checkuninitvar.check(); + } + // TODO: get rid of this void checkUninitVar_(const char* file, int line, const std::string& code) { SimpleTokenizer tokenizer(settings, *this); @@ -8045,6 +8058,15 @@ class TestUninitVar : public TestFixture { ASSERT_EQUALS("[test.cpp:5:7]: (error) Uninitialized variable: mp [legacyUninitvar]\n", errout_str()); } + void uninitvarDiag() { + checkUninitVarAll("struct S { int x; };\n" // #15216 + "int f() {\n" + " S s;\n" + " return s.x;\n" + "}\n"); + ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: s.x [uninitvar]\n", errout_str()); + } + void isVariableUsageDeref() { // *p checkUninitVar("void f() {\n" From 148b32d9948c02042dfa818adee52b786b99b05e Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Mon, 16 Nov 2026 10:18:05 +0100 Subject: [PATCH 4/8] Update testuninitvar.cpp [skip ci] --- test/testuninitvar.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp index 7429c30ba47..c034d6393ec 100644 --- a/test/testuninitvar.cpp +++ b/test/testuninitvar.cpp @@ -101,13 +101,12 @@ class TestUninitVar : public TestFixture { TEST_CASE(uninitvar_nonmember); // crash in ycmd test TEST_CASE(uninitvarDesignatedInitializers); TEST_CASE(uninitvarMemberPointer); - TEST_CASE(uninitvarDiag); TEST_CASE(isVariableUsageDeref); // *p TEST_CASE(isVariableUsageDerefValueflow); // *p TEST_CASE(uninitvar_memberaccess); // (&(a))->b <=> a.b - + TEST_CASE(uninitvar_diag); // whole program analysis TEST_CASE(ctuTest); @@ -8058,15 +8057,6 @@ class TestUninitVar : public TestFixture { ASSERT_EQUALS("[test.cpp:5:7]: (error) Uninitialized variable: mp [legacyUninitvar]\n", errout_str()); } - void uninitvarDiag() { - checkUninitVarAll("struct S { int x; };\n" // #15216 - "int f() {\n" - " S s;\n" - " return s.x;\n" - "}\n"); - ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: s.x [uninitvar]\n", errout_str()); - } - void isVariableUsageDeref() { // *p checkUninitVar("void f() {\n" @@ -8279,6 +8269,15 @@ class TestUninitVar : public TestFixture { ASSERT_EQUALS("", errout_str()); } + void uninitvar_diag() { + checkUninitVarAll("struct S { int x; };\n" // #15216 + "int f() {\n" + " S s;\n" + " return s.x;\n" + "}\n"); + ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: s.x [uninitvar]\n", errout_str()); + } + void ctuTest() { ctu("void f(int *p) {\n" " a = *p;\n" From c58340f44303689d4c906180aada458c552e0870 Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Mon, 16 Nov 2026 10:18:57 +0100 Subject: [PATCH 5/8] Update checkuninitvar.cpp --- lib/checkuninitvar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp index 88c355af5d4..595bfa4084b 100644 --- a/lib/checkuninitvar.cpp +++ b/lib/checkuninitvar.cpp @@ -106,7 +106,7 @@ bool CheckUninitVarImpl::diag(const Token* tok, bool insert) tok = tok->astParent(); if (!insert) return mUninitDiags.find(tok) != mUninitDiags.end(); - return !mUninitDiags.insert(tok).second; + return !mUninitDiags.insert(tok).second; } void CheckUninitVarImpl::check() From a0ec186789b1bcfe40e6e5640c6180e6b9f20fba Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Mon, 16 Nov 2026 10:23:28 +0100 Subject: [PATCH 6/8] Update checkuninitvar.cpp --- lib/checkuninitvar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp index 595bfa4084b..fe1ecf6fe1f 100644 --- a/lib/checkuninitvar.cpp +++ b/lib/checkuninitvar.cpp @@ -106,7 +106,7 @@ bool CheckUninitVarImpl::diag(const Token* tok, bool insert) tok = tok->astParent(); if (!insert) return mUninitDiags.find(tok) != mUninitDiags.end(); - return !mUninitDiags.insert(tok).second; + return !mUninitDiags.insert(tok).second; } void CheckUninitVarImpl::check() From 53d5e21f4361103d6ce542b78df43959d7df67ae Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Mon, 16 Nov 2026 10:39:03 +0100 Subject: [PATCH 7/8] Update gtk.c --- test/cfg/gtk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cfg/gtk.c b/test/cfg/gtk.c index 0b1e17e013a..a6da9b851ad 100644 --- a/test/cfg/gtk.c +++ b/test/cfg/gtk.c @@ -683,7 +683,7 @@ void g_ascii_formatd_format_test(const gchar *format, int i) struct { double x; } s; - // cppcheck-suppress [uninitvar, uninitStructMember] + // cppcheck-suppress uninitvar g_ascii_formatd(buf, sizeof(buf), format, s.x); g_print("%s", buf); } From 65abef8608a2829217b03a85b1ca5afc5fe0921a Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Mon, 16 Nov 2026 12:38:45 +0100 Subject: [PATCH 8/8] Update checkuninitvar.cpp --- lib/checkuninitvar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp index fe1ecf6fe1f..ffdedd83d1d 100644 --- a/lib/checkuninitvar.cpp +++ b/lib/checkuninitvar.cpp @@ -1622,7 +1622,7 @@ void CheckUninitVarImpl::uninitvarError(const Token* tok, const ValueFlow::Value void CheckUninitVarImpl::uninitStructMemberError(const Token *tok, const std::string &membername) { - if (diag(tok, /*insert*/ false)) + if (tok && diag(tok, /*insert*/ false)) return; reportError(tok, Severity::error,