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

CheckLeakAutoVar: Use Library::isSmartPointer()

This commit is contained in:
Daniel Marjamäki 2019-04-24 15:35:47 +02:00
parent 87a3d2caa1
commit da46bff1b3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkleakautovar.cpp
View File

@ -591,9 +591,7 @@ void CheckLeakAutoVar::checkScope(const Token * const startToken,
}
// Check smart pointer
else if (Token::Match(ftok, "auto_ptr|unique_ptr|shared_ptr < %type%")) {
else if (Token::Match(ftok, "%name% <") && mSettings->library.isSmartPointer(tok)) {
const Token * typeEndTok = ftok->linkAt(1);
if (!Token::Match(typeEndTok, "> %var% {|( %var% ,|)|}"))
continue;
@ -746,6 +744,8 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
arg = arg->tokAt(5);
}
const Token * const argTypeStartTok = arg;
while (Token::Match(arg, "%name% .|:: %name%"))
arg = arg->tokAt(2);
@ -761,7 +761,7 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
changeAllocStatus(varInfo, allocation, tokName, arg);
}
// Check smart pointer
else if (Token::Match(arg, "auto_ptr|unique_ptr|shared_ptr < %type%")) {
else if (Token::Match(arg, "%name% < %type%") && mSettings->library.isSmartPointer(argTypeStartTok)) {
const Token * typeEndTok = arg->linkAt(1);
if (!Token::Match(typeEndTok, "> {|( %var% ,|)|}"))
continue;

2
test/testleakautovar.cpp
View File

@ -40,6 +40,8 @@ private:
while (!settings.library.isresource(++id));
settings.library.setalloc("fopen", id, -1);
settings.library.setdealloc("fclose", id, 1);
settings.library.smartPointers.insert("std::shared_ptr");
settings.library.smartPointers.insert("std::unique_ptr");
// Assign
TEST_CASE(assign1);