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

Fixed #3702 (False negative: fail to detect constructor implementation with slightly different (irrelevant) signatures)

This commit is contained in:
Robert Reif 2012-11-26 16:34:44 +01:00 committed by Daniel Marjamäki
parent 76639578ad
commit bbc1747919
3 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/symboldatabase.cpp
View File

@ -898,6 +898,16 @@ void Variable::evaluate()
bool Function::argsMatch(const Scope *scope, const Token *first, const Token *second, const std::string &path, unsigned int depth)
{
const bool isCPP = scope->check->isCPP();
// skip "struct" if it is C++
if (isCPP) {
if (first->str() == "struct")
first = first->next();
if (second->str() == "struct")
second = second->next();
}
while (first->str() == second->str()) {
// at end of argument list
if (first->str() == ")") {
@ -975,6 +985,14 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
first = first->next();
second = second->next();
// skip "struct" if it is C++
if (isCPP) {
if (first->str() == "struct")
first = first->next();
if (second->str() == "struct")
second = second->next();
}
}
return false;
@ -2281,3 +2299,10 @@ unsigned int Scope::getNestedNonFunctions() const
}
return nested;
}
//---------------------------------------------------------------------------
bool SymbolDatabase::isCPP() const
{
return _tokenizer->isCPP();
}

2
lib/symboldatabase.h
View File

@ -614,6 +614,8 @@ public:
void printOut(const char * title = NULL) const;
void printVariable(const Variable *var, const char *indent) const;
bool isCPP() const;
private:
// Needed by Borland C++:

24
test/testconstructors.cpp
View File

@ -107,6 +107,7 @@ private:
TEST_CASE(uninitVar20); // ticket #2867
TEST_CASE(uninitVar21); // ticket #2947
TEST_CASE(uninitVar22); // ticket #3043
TEST_CASE(uninitVar23); // ticket #3702
TEST_CASE(uninitVarEnum);
TEST_CASE(uninitVarStream);
TEST_CASE(uninitVarTypedef);
@ -1561,6 +1562,29 @@ private:
ASSERT_EQUALS("[test.cpp:7]: (warning) Member variable 'Fred::x' is not assigned a value in 'Fred::operator='.\n", errout.str());
}
void uninitVar23() { // ticket #3702
check("class Fred {\n"
" int x;\n"
"public:\n"
" Fred(struct A a, struct B b);\n"
" Fred(C c, struct D d);\n"
" Fred(struct E e, F f);\n"
" Fred(struct G, struct H);\n"
" Fred(I, J);\n"
"};\n"
"Fred::Fred(A a, B b) { }\n"
"Fred::Fred(struct C c, D d) { }\n"
"Fred::Fred(E e, struct F f) { }\n"
"Fred::Fred(G g, H h) { }\n"
"Fred::Fred(struct I i, struct J j) { }\n"
);
ASSERT_EQUALS("[test.cpp:10]: (warning) Member variable 'Fred::x' is not initialized in the constructor.\n"
"[test.cpp:11]: (warning) Member variable 'Fred::x' is not initialized in the constructor.\n"
"[test.cpp:12]: (warning) Member variable 'Fred::x' is not initialized in the constructor.\n"
"[test.cpp:13]: (warning) Member variable 'Fred::x' is not initialized in the constructor.\n"
"[test.cpp:14]: (warning) Member variable 'Fred::x' is not initialized in the constructor.\n", errout.str());
}
void uninitVarArray1() {
check("class John\n"
"{\n"