Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/checkuninitvar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,14 @@ static std::map<nonneg int, VariableValue> 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;
}

Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion lib/checkuninitvar.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::string> &arrayTypeDefs);
Expand Down
2 changes: 1 addition & 1 deletion test/cfg/gtk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
21 changes: 21 additions & 0 deletions test/testuninitvar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -132,6 +133,17 @@ class TestUninitVar : public TestFixture {
checkuninitvar.check();
}

#define checkUninitVarAll(...) checkUninitVarAll_(__FILE__, __LINE__, __VA_ARGS__)
template<size_t size>
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);
Expand Down Expand Up @@ -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"
Expand Down
Loading