Skip to content
Merged
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
8 changes: 3 additions & 5 deletions lib/checkclass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1084,13 +1084,11 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
}

// Assignment of array item of member variable?
else if (Token::Match(ftok, "* %name% =")) {
else if (Token::Match(ftok, "* %name% =") && (!func.isConstructor() || (!ftok->next()->variable() || ftok->next()->variable()->isArray()))) {
assignVar(usage, ftok->next()->varId());
} else if (Token::Match(ftok, "( * %name% ) =")) {
} else if (Token::Match(ftok, "( * %name% ) =") && (!func.isConstructor() || (!ftok->tokAt(2)->variable() || ftok->tokAt(2)->variable()->isArray()))) {
assignVar(usage, ftok->tokAt(2)->varId());
} else if (Token::Match(ftok, "* ( %name% ) =")) {
assignVar(usage, ftok->tokAt(2)->varId());
} else if (Token::Match(ftok, "* this . %name% =")) {
} else if (Token::Match(ftok, "* this . %name% =") && (!func.isConstructor() || (!ftok->tokAt(3)->variable() || ftok->tokAt(3)->variable()->isArray()))) {
assignVar(usage, ftok->tokAt(3)->varId());
} else if (astIsRangeBasedForDecl(ftok)) {
if (const Variable* rangeVar = ftok->astParent()->astOperand1()->variable()) {
Expand Down
12 changes: 12 additions & 0 deletions test/testconstructors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4165,6 +4165,18 @@ class TestConstructors : public TestFixture {
" std::map<int, int>* pMap = nullptr;\n"
"};\n");
ASSERT_EQUALS("", errout_str());

check("struct S {\n" // #6294
" S() : r(new int) {\n"
" *p = 0;\n"
" *(q) = 1;\n"
" *r = 2;\n"
" }\n"
" int *p, *q, *r;\n"
"};\n");
ASSERT_EQUALS("[test.cpp:2:5]: (warning) Member variable 'S::p' is not initialized in the constructor. [uninitMemberVar]\n"
"[test.cpp:2:5]: (warning) Member variable 'S::q' is not initialized in the constructor. [uninitMemberVar]\n",
errout_str());
}

void uninitConstVar() {
Expand Down
Loading