diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp index 4acf003af99..ffdedd83d1d 100644 --- a/lib/checkuninitvar.cpp +++ b/lib/checkuninitvar.cpp @@ -98,12 +98,14 @@ 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(); + if (!insert) + return mUninitDiags.find(tok) != mUninitDiags.end(); return !mUninitDiags.insert(tok).second; } @@ -1620,6 +1622,8 @@ void CheckUninitVarImpl::uninitvarError(const Token* tok, const ValueFlow::Value void CheckUninitVarImpl::uninitStructMemberError(const Token *tok, const std::string &membername) { + if (tok && diag(tok, /*insert*/ false)) + return; reportError(tok, Severity::error, "uninitStructMember", 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); 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); } diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp index 6e742d31bcc..c034d6393ec 100644 --- a/test/testuninitvar.cpp +++ b/test/testuninitvar.cpp @@ -106,6 +106,7 @@ class TestUninitVar : public TestFixture { TEST_CASE(isVariableUsageDerefValueflow); // *p TEST_CASE(uninitvar_memberaccess); // (&(a))->b <=> a.b + TEST_CASE(uninitvar_diag); // whole program analysis TEST_CASE(ctuTest); @@ -132,6 +133,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); @@ -8257,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"