Skip to content

Fix #14945 FN memleak with nested scopes. #8761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
chrchr-github wants to merge 4 commits into
base: main
Choose a base branch
from
+31 −0
Draft

Fix #14945 FN memleak with nested scopes. #8761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fac1f2
Update checkleakautovar.cpp
chrchr-github Jul 28, 2026
2bd7e6f
Update testleakautovar.cpp
chrchr-github Jul 28, 2026
4e595f4
Update checkleakautovar.cpp [skip ci]
chrchr-github Jul 28, 2026
e155074
Update testleakautovar.cpp
chrchr-github Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/checkleakautovar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,8 @@ bool CheckLeakAutoVarImpl::checkScope(const Token * const startToken,
}
}

if (tok == tok->scope()->bodyEnd && tok->scope()->type == ScopeType::eUnconditional)
ret(tok, varInfo, /*isEndOfScope*/ true);

// look for end of statement
const bool isInit = Token::Match(tok->tokAt(-1), "%var% {|(") && tok->tokAt(-1)->variable() && tok->tokAt(-1) == tok->tokAt(-1)->variable()->nameToken();
Expand Down
29 changes: 29 additions & 0 deletions test/testleakautovar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ class TestLeakAutoVar : public TestFixture {
TEST_CASE(inlineFunction); // #3989

TEST_CASE(smartPtrInContainer); // #8262
TEST_CASE(unconditionalScope);

TEST_CASE(functionCallCastConfig); // #9652
TEST_CASE(functionCallLeakIgnoreConfig); // #7923
Expand Down Expand Up @@ -3178,6 +3179,34 @@ class TestLeakAutoVar : public TestFixture {
ASSERT_EQUALS("", errout_str());
}

void unconditionalScope() {
check("void f() {\n" // #14945
" {\n"
" int* p = new int;\n"
" *p = 1;\n"
" }\n"
" {\n"
" int* q = new int;\n"
" *q = 2;\n"
" delete q;\n"
" }\n"
" int* r = new int;\n"
" *r = 3;\n"
" delete r;\n"
"}\n", dinit(CheckOptions, $.cpp = true));
ASSERT_EQUALS("[test.cpp:5:5]: (error) Memory leak: p [memleak]\n", errout_str());

check("void f() {\n"
" int* p = new int;\n"
" {\n"
" (void)p;\n"
" }\n"
" *p = 1;\n"
" delete p;\n"
"}\n", dinit(CheckOptions, $.cpp = true));
ASSERT_EQUALS("", errout_str());
}

void functionCallCastConfig() { // #9652
constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
"<def format=\"2\">\n"
Expand Down
Loading