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

CheckLeakAutoVar: updated handling of unknown types in C++

This commit is contained in:
Daniel Marjamäki 2015-08-11 12:41:42 +02:00
parent b0b01d3962
commit 501ab0b6da
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/checkleakautovar.cpp
View File

@ -235,18 +235,22 @@ void CheckLeakAutoVar::checkScope(const Token * const startToken,
// not a local variable nor argument? // not a local variable nor argument?
const Variable *var = tok->variable(); const Variable *var = tok->variable();
if (var && !var->isArgument() && (!var->isLocal() || var->isStatic())) { if (var && !var->isArgument() && (!var->isLocal() || var->isStatic()))
continue;
}
// non-pod variable
if (_tokenizer->isCPP() && (!var || !var->typeStartToken()->isStandardType()))
continue; continue;
// Don't check reference variables // Don't check reference variables
if (var && var->isReference()) if (var && var->isReference())
continue; continue;
// non-pod variable
if (_tokenizer->isCPP()) {
if (!var)
continue;
// Possibly automatically deallocated memory
if (!var->typeStartToken()->isStandardType() && Token::Match(tok, "%var% = new"))
continue;
}
// allocation? // allocation?
if (tok->next()->astOperand2() && Token::Match(tok->next()->astOperand2()->previous(), "%type% (")) { if (tok->next()->astOperand2() && Token::Match(tok->next()->astOperand2()->previous(), "%type% (")) {
int i = _settings->library.alloc(tok->next()->astOperand2()->previous()); int i = _settings->library.alloc(tok->next()->astOperand2()->previous());

5
test/testleakautovar.cpp
View File

@ -1068,10 +1068,13 @@ private:
void test5() { // unknown type void test5() { // unknown type
check("void f() { Fred *p = malloc(10); }", true); check("void f() { Fred *p = malloc(10); }", true);
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("[test.cpp:1]: (error) Memory leak: p\n", errout.str());
check("void f() { Fred *p = malloc(10); }", false); check("void f() { Fred *p = malloc(10); }", false);
ASSERT_EQUALS("[test.c:1]: (error) Memory leak: p\n", errout.str()); ASSERT_EQUALS("[test.c:1]: (error) Memory leak: p\n", errout.str());
check("void f() { Fred *p = new Fred; }", true);
ASSERT_EQUALS("", errout.str());
} }
void throw1() { // 3987 - Execution reach a 'throw' void throw1() { // 3987 - Execution reach a 'throw'