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

Fixed false positives #6473 and #6469

This commit is contained in:
PKEuS 2015-01-29 21:26:06 +01:00
parent 71379616e7
commit 80feb8697d
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/checkleakautovar.cpp
View File

@ -150,6 +150,9 @@ void CheckLeakAutoVar::checkScope(const Token * const startToken,
// Parse all tokens
const Token * const endToken = startToken->link();
for (const Token *tok = startToken; tok && tok != endToken; tok = tok->next()) {
if (!tok->scope()->isExecutable())
tok = tok->scope()->classEnd;
// Deallocation and then dereferencing pointer..
if (tok->varId() > 0) {
const std::map<unsigned int, VarInfo::AllocInfo>::iterator var = alloctype.find(tok->varId());
@ -181,7 +184,9 @@ void CheckLeakAutoVar::checkScope(const Token * const startToken,
if (!tok || tok == endToken)
break;
// parse statement
// parse statement, skip to last member
while (Token::Match(tok, "%var% ::|. %var% !!("))
tok = tok->tokAt(2);
// assignment..
if (tok->varId() && Token::Match(tok, "%var% =")) {

25
test/testleakautovar.cpp
View File

@ -53,7 +53,7 @@ private:
TEST_CASE(deallocuse4);
TEST_CASE(deallocuse5); // #4018: FP. free(p), p = 0;
TEST_CASE(deallocuse6); // #4034: FP. x = p = f();
TEST_CASE(deallocuse7); // #6467
TEST_CASE(deallocuse7); // #6467, #6469, #6473
TEST_CASE(doublefree1);
TEST_CASE(doublefree2);
@ -316,7 +316,7 @@ private:
ASSERT_EQUALS("", errout.str());
}
void deallocuse7() { // #6467
void deallocuse7() { // #6467, #6469, #6473
check("struct Foo { int* ptr; };\n"
"void f(Foo* foo) {\n"
" delete foo->ptr;\n"
@ -330,6 +330,27 @@ private:
" x = *foo->ptr; \n"
"}", true);
ASSERT_EQUALS("[test.cpp:4]: (error) Dereferencing 'ptr' after it is deallocated / released\n", errout.str());
check("void parse() {\n"
" struct Buf {\n"
" Buf(uint32_t len) : m_buf(new uint8_t[len]) {}\n"
" ~Buf() { delete[]m_buf; }\n"
" uint8_t *m_buf;\n"
" };\n"
"}", true);
ASSERT_EQUALS("", errout.str());
check("struct Foo {\n"
" Foo();\n"
" Foo* ptr;\n"
" void func();\n"
"};\n"
"void bar(Foo* foo) {\n"
" delete foo->ptr;\n"
" foo->ptr = new Foo;\n"
" foo->ptr->func();\n"
"}", true);
ASSERT_EQUALS("", errout.str());
}
void doublefree1() { // #3895