walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix couple issues with missing operatorEqVarError (#4576)

This commit is contained in:
gerboengels 2022-11-05 10:48:34 +01:00 committed by GitHub
parent 6488650d24
commit d7a8f7f297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 92 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/checkclass.cpp
View File

@ -686,6 +686,21 @@ void CheckClass::assignAllVar(std::vector<Usage> &usageList)
i.assign = true;
}
void CheckClass::assignAllVarsVisibleFromScope(std::vector<Usage>& usageList, const Scope* scope)
{
for (Usage& usage : usageList) {
if (usage.var->scope() == scope)
usage.assign = true;
}
// Iterate through each base class...
for (const Type::BaseInfo& i : scope->definedType->derivedFrom) {
const Type *derivedFrom = i.type;
assignAllVarsVisibleFromScope(usageList, derivedFrom->classScope);
}
}
void CheckClass::clearAllVar(std::vector<Usage> &usageList)
{
for (Usage & i : usageList) {
@ -694,7 +709,7 @@ void CheckClass::clearAllVar(std::vector<Usage> &usageList)
}
}
bool CheckClass::isBaseClassFunc(const Token *tok, const Scope *scope)
bool CheckClass::isBaseClassMutableMemberFunc(const Token *tok, const Scope *scope)
{
// Iterate through each base class...
for (const Type::BaseInfo & i : scope->definedType->derivedFrom) {
@ -705,11 +720,11 @@ bool CheckClass::isBaseClassFunc(const Token *tok, const Scope *scope)
const std::list<Function>& functionList = derivedFrom->classScope->functionList;
if (std::any_of(functionList.begin(), functionList.end(), [&](const Function& func) {
return func.tokenDef->str() == tok->str();
return func.tokenDef->str() == tok->str() && !func.isStatic() && !func.isConst();
}))
return true;
if (isBaseClassFunc(tok, derivedFrom->classScope))
if (isBaseClassMutableMemberFunc(tok, derivedFrom->classScope))
return true;
}
@ -894,6 +909,12 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
callstack.pop_back();
}
// assume that a base class call to operator= assigns all its base members (but not more)
else if (func.tokenDef->str() == ftok->str() && isBaseClassMutableMemberFunc(ftok, scope)) {
if (member->nestedIn)
assignAllVarsVisibleFromScope(usage, member->nestedIn->definedType->classScope);
}
// there is a called member function, but it has no implementation, so we assume it initializes everything
else {
assignAllVar(usage);
@ -949,8 +970,8 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
}
}
// there is a called member function, but it has no implementation, so we assume it initializes everything
else {
// there is a called member function, but it has no implementation, so we assume it initializes everything (if it can mutate state)
else if (!member->isConst() && !member->isStatic()) {
assignAllVar(usage);
}
}
@ -958,7 +979,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
// not member function
else {
// could be a base class virtual function, so we assume it initializes everything
if (!func.isConstructor() && isBaseClassFunc(ftok, scope)) {
if (!func.isConstructor() && isBaseClassMutableMemberFunc(ftok, scope)) {
/** @todo False Negative: we should look at the base class functions to see if they
* call any derived class virtual functions that change the derived class state
*/

9
lib/checkclass.h
View File

@ -336,7 +336,7 @@ private:
bool init;
};
static bool isBaseClassFunc(const Token *tok, const Scope *scope);
static bool isBaseClassMutableMemberFunc(const Token *tok, const Scope *scope);
/**
* @brief Create usage list that contains all scope members and also members
@ -372,6 +372,13 @@ private:
*/
static void assignAllVar(std::vector<Usage> &usageList);
/**
* @brief set all variable in list assigned, if visible from given scope
* @param usageList reference to usage vector
* @param scope scope from which usages must be visible
*/
static void assignAllVarsVisibleFromScope(std::vector<Usage> &usageList, const Scope *scope);
/**
* @brief set all variables in list not assigned and not initialized
* @param usageList reference to usage vector

57
test/testconstructors.cpp
View File

@ -116,6 +116,7 @@ private:
TEST_CASE(initvar_operator_eq5); // ticket #4119
TEST_CASE(initvar_operator_eq6);
TEST_CASE(initvar_operator_eq7);
TEST_CASE(initvar_operator_eq8);
TEST_CASE(initvar_same_classname); // BUG 2208157
TEST_CASE(initvar_chained_assign); // BUG 2270433
TEST_CASE(initvar_2constructors); // BUG 2270353
@ -981,6 +982,30 @@ private:
ASSERT_EQUALS("", errout.str());
}
void initvar_operator_eq8() {
check("struct B {\n"
" int b;\n"
"};\n"
"struct D1 : B {\n"
" D1& operator=(const D1& src);\n"
" int d1;\n"
"};\n"
"struct D2 : D1 {\n"
" D2& operator=(const D2& src);\n"
" int d2;\n"
"};\n"
"struct D3 : D2 {\n"
" D3& operator=(const D3& src) {\n"
" D1::operator=(src);\n"
" d3_1 = src.d3_1;\n"
" }\n"
" int d3_1;\n"
" int d3_2;\n"
"}\n");
ASSERT_EQUALS("[test.cpp:13]: (warning) Member variable 'D3::d3_2' is not assigned a value in 'D3::operator='.\n"
"[test.cpp:13]: (warning) Member variable 'D3::d2' is not assigned a value in 'D3::operator='.\n", errout.str());
}
void initvar_same_classname() {
// Bug 2208157 - False positive: Uninitialized variable, same class name
@ -3324,6 +3349,38 @@ private:
"};");
ASSERT_EQUALS("[test.cpp:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor.\n", errout.str());
// Unknown member functions and unknown static functions
check("class ABC {\n"
" static void static_base_func();\n"
" void const_base_func() const;\n"
"};\n"
"class Fred : private ABC {\n"
"public:\n"
" Fred() {\n"
" const_func();\n"
" static_func();\n"
" const_base_func();\n"
" ABC::static_base_func();\n"
" }\n"
" void const_func() const;\n"
" static void static_f();\n"
"private:\n"
" int i;\n"
"};");
// Unknown overloaded member functions
check("class Fred : private ABC {\n"
"public:\n"
" Fred() {\n"
" func();\n"
" }\n"
" void func() const;\n"
" void func();\n"
"private:\n"
" int i;\n"
"};");
ASSERT_EQUALS("", errout.str());
}
void uninitVarEnum1() {