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

Fixed #5273 (FP memleak: Unknown if() condition should make error inconclusive)

This commit is contained in:
Daniel Marjamäki 2017-06-30 23:05:09 +02:00
parent b97f5d909e
commit f847631cdb
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/checkleakautovar.cpp
View File

@ -351,6 +351,24 @@ void CheckLeakAutoVar::checkScope(const Token * const startToken,
if (tok3->str() == "(" && Token::Match(tok3->astOperand1(), "UNLIKELY|LIKELY")) {
tokens.push(tok3->astOperand2());
continue;
} else if (tok3->str() == "(" && Token::Match(tok3->previous(), "%name%")) {
std::vector<const Token *> params = getArguments(tok3->previous());
for (unsigned int i = 0; i < params.size(); ++i) {
const Token *par = params[i];
if (!par->isComparisonOp())
continue;
const Token *vartok = nullptr;
if (astIsVariableComparison(par, "!=", "0", &vartok) ||
astIsVariableComparison(par, "==", "0", &vartok) ||
astIsVariableComparison(par, "<", "0", &vartok) ||
astIsVariableComparison(par, ">", "0", &vartok) ||
astIsVariableComparison(par, "==", "-1", &vartok) ||
astIsVariableComparison(par, "!=", "-1", &vartok)) {
varInfo1.erase(vartok->varId());
varInfo2.erase(vartok->varId());
}
}
continue;
}
const Token *vartok = nullptr;

11
test/testleakautovar.cpp
View File

@ -89,6 +89,7 @@ private:
TEST_CASE(ifelse6); // #3370
TEST_CASE(ifelse7); // #5576 - if (fd < 0)
TEST_CASE(ifelse8); // #5747 - if (fd == -1)
TEST_CASE(ifelse9); // #5273 - if (X(p==NULL, 0))
// switch
TEST_CASE(switch1);
@ -1024,6 +1025,16 @@ private:
ASSERT_EQUALS("", errout.str());
}
void ifelse9() { // #5273
check("void f() {\n"
" char *p = malloc(100);\n"
" if (dostuff(p==NULL,0))\n"
" return;\n"
" free(p);\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void switch1() {
check("void f() {\n"
" char *p = 0;\n"