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

CheckMemoryLeak: Correctly detect new char[...]() as array allocation (#7164)

This commit is contained in:
PKEuS 2015-11-27 11:04:18 +01:00
parent a6206ae727
commit 0ba3d25917
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkmemoryleak.cpp
View File

@ -123,7 +123,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
return Malloc; return Malloc;
if (tokenizer->isCPP() && tok2->str() == "new") { if (tokenizer->isCPP() && tok2->str() == "new") {
if (tok2->astOperand1() && tok2->astOperand1()->str() == "[") if (tok2->astOperand1() && (tok2->astOperand1()->str() == "[" || (tok2->astOperand1()->astOperand1() && tok2->astOperand1()->astOperand1()->str() == "[")))
return NewArray; return NewArray;
return New; return New;
} }

6
test/testmemleak.cpp
View File

@ -1420,6 +1420,12 @@ private:
" free(a);\n" " free(a);\n"
"}\n", false, false, true); "}\n", false, false, true);
ASSERT_EQUALS("[test.cpp:4]: (error) Mismatching allocation and deallocation: a\n", errout.str()); ASSERT_EQUALS("[test.cpp:4]: (error) Mismatching allocation and deallocation: a\n", errout.str());
check("void f() {\n"
" char* str = new char[42]();\n"
" delete[] str;\n"
"}");
ASSERT_EQUALS("", errout.str());
} }
void mismatch2() { void mismatch2() {