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

Fix #11391 FP doubleFree with goto (#4587)

This commit is contained in:
chrchr-github 2022-11-19 16:49:34 +01:00 committed by GitHub
parent 50241224d0
commit 9f50611a44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/checkleakautovar.cpp
View File

@ -284,7 +284,7 @@ static const Token * isFunctionCall(const Token * nameToken)
return nullptr; return nullptr;
} }
void CheckLeakAutoVar::checkScope(const Token * const startToken, bool CheckLeakAutoVar::checkScope(const Token * const startToken,
VarInfo *varInfo, VarInfo *varInfo,
std::set<int> notzero, std::set<int> notzero,
nonneg int recursiveCount) nonneg int recursiveCount)
@ -532,10 +532,12 @@ void CheckLeakAutoVar::checkScope(const Token * const startToken,
return ChildrenToVisit::none; return ChildrenToVisit::none;
}); });
checkScope(closingParenthesis->next(), &varInfo1, notzero, recursiveCount); if (!checkScope(closingParenthesis->next(), &varInfo1, notzero, recursiveCount))
continue;
closingParenthesis = closingParenthesis->linkAt(1); closingParenthesis = closingParenthesis->linkAt(1);
if (Token::simpleMatch(closingParenthesis, "} else {")) { if (Token::simpleMatch(closingParenthesis, "} else {")) {
checkScope(closingParenthesis->tokAt(2), &varInfo2, notzero, recursiveCount); if (!checkScope(closingParenthesis->tokAt(2), &varInfo2, notzero, recursiveCount))
continue;
tok = closingParenthesis->linkAt(2)->previous(); tok = closingParenthesis->linkAt(2)->previous();
} else { } else {
tok = closingParenthesis->previous(); tok = closingParenthesis->previous();
@ -675,6 +677,7 @@ void CheckLeakAutoVar::checkScope(const Token * const startToken,
// goto => weird execution path // goto => weird execution path
else if (tok->str() == "goto") { else if (tok->str() == "goto") {
varInfo->clear(); varInfo->clear();
return false;
} }
// continue/break // continue/break
@ -765,6 +768,7 @@ void CheckLeakAutoVar::checkScope(const Token * const startToken,
} }
} }
ret(endToken, *varInfo, true); ret(endToken, *varInfo, true);
return true;
} }

2
lib/checkleakautovar.h
View File

@ -125,7 +125,7 @@ private:
void check(); void check();
/** check for leaks in a function scope */ /** check for leaks in a function scope */
void checkScope(const Token * const startToken, bool checkScope(const Token * const startToken,
VarInfo *varInfo, VarInfo *varInfo,
std::set<int> notzero, std::set<int> notzero,
nonneg int recursiveCount); nonneg int recursiveCount);

15
test/testleakautovar.cpp
View File

@ -1241,8 +1241,8 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void doublefree4() { // #5451 - exit void doublefree4() {
check("void f(char *p) {\n" check("void f(char *p) {\n" // #5451 - exit
" if (x) {\n" " if (x) {\n"
" free(p);\n" " free(p);\n"
" exit(1);\n" " exit(1);\n"
@ -1250,6 +1250,17 @@ private:
" free(p);\n" " free(p);\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void f(void* p, int i) {\n" // #11391
" if (i)\n"
" goto cleanup;\n"
" free(p);\n"
" exit(0);\n"
"cleanup:\n"
" free(p);\n"
" exit(1);\n"
"}\n");
ASSERT_EQUALS("", errout.str());
} }
void doublefree5() { // #5522 void doublefree5() { // #5522