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

Merge pull request #650 from simartin/memset_indirections_fix 

Fix CheckClass::checkMemset for arrays of pointers.
This commit is contained in:
amai2012 2015-08-25 20:53:44 +02:00
parent cc8939cef9 8beb95e179
commit 83c4afa694
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/checkclass.cpp
View File

@ -1010,28 +1010,30 @@ void CheckClass::checkMemset()
else if (Token::simpleMatch(arg3, "sizeof ( * this ) )") || Token::simpleMatch(arg1, "this ,")) {
type = findFunctionOf(arg3->scope());
} else if (Token::Match(arg1, "&|*|%var%")) {
int derefs = 1;
int numIndirToVariableType = 0; // Offset to the actual type in terms of dereference/addressof
for (;; arg1 = arg1->next()) {
if (arg1->str() == "&")
derefs--;
++numIndirToVariableType;
else if (arg1->str() == "*")
derefs++;
--numIndirToVariableType;
else
break;
}
const Variable *var = arg1->variable();
if (var && arg1->strAt(1) == ",") {
if (var->isPointer()) {
derefs--;
if (var->typeEndToken() && Token::simpleMatch(var->typeEndToken()->previous(), "* *")) // Check if it's a pointer to pointer
derefs--;
if (var->isArrayOrPointer()) {
const Token *endTok = var->typeEndToken();
while (endTok && Token::simpleMatch(endTok, "*")) {
--numIndirToVariableType;
endTok = endTok->previous();
}
}
if (var->isArray())
derefs -= (int)var->dimensions().size();
numIndirToVariableType += (int)var->dimensions().size();
if (derefs == 0)
if (numIndirToVariableType == 1)
type = var->typeScope();
}
}

5
test/testclass.cpp
View File

@ -2581,10 +2581,7 @@ private:
" memset(c2, 0, 10);\n"
" memset(c3, 0, 10);\n"
"}");
ASSERT_EQUALS("[test.cpp:9]: (error) Using 'memset' on struct that contains a 'std::string'.\n"
"[test.cpp:11]: (error) Using 'memset' on struct that contains a 'std::string'.\n"
"[test.cpp:12]: (error) Using 'memset' on struct that contains a 'std::string'.\n"
"[test.cpp:13]: (error) Using 'memset' on struct that contains a 'std::string'.\n", errout.str());
ASSERT_EQUALS("[test.cpp:12]: (error) Using 'memset' on struct that contains a 'std::string'.\n", errout.str());
}
void memsetOnStdPodType() { // Ticket #5901