Skip to content

Fix #11155 FN: leakNoVarFunctionCall (ternary operator) #4239

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

Merged
orbitcowboy merged 6 commits into from
Jun 27, 2022
Merged

Fix #11155 FN: leakNoVarFunctionCall (ternary operator) #4239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e47176
Fix #10857 FN: leakNoVarFunctionCall
chrchr-github Jun 27, 2022
96e4f3b
Fix TODO
chrchr-github Jun 27, 2022
802b07c
Merge branch 'main' into chr_Fix10857
chrchr-github Jun 27, 2022
0f63ea3
Fix #10858 FN: leakNoVarFunctionCall (if ( b && malloc ) )
chrchr-github Jun 27, 2022
923f36c
#11155 FN: leakNoVarFunctionCall (ternary operator)
chrchr-github Jun 27, 2022
496b104
Merge
chrchr-github Jun 27, 2022
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
11 changes: 8 additions & 3 deletions lib/checkmemoryleak.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,9 +1070,14 @@ void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope)
if (closingBrace->str() == "}" && Token::Match(closingBrace->link()->tokAt(-1), "%name%") && (!isNew && precedes(tok, closingBrace->link())))
continue;
returnValueNotUsedError(tok, tok->str());
} else if (Token::Match(parent, "%comp%|!|,|%oror%|&&")) {
if (!(parent->astParent() && parent->str() == ","))
returnValueNotUsedError(tok, tok->str());
} else if (Token::Match(parent, "%comp%|!|,|%oror%|&&|:")) {
if (parent->astParent() && parent->str() == ",")
continue;
if (parent->str() == ":") {
if (!(Token::simpleMatch(parent->astParent(), "?") && !parent->astParent()->astParent()))
continue;
}
returnValueNotUsedError(tok, tok->str());
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions test/testmemleak.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2607,6 +2607,14 @@ class TestMemleakNoVar : public TestFixture {
ASSERT_EQUALS("[test.cpp:1]: (error) Return value of allocation function 'malloc' is not stored.\n"
"[test.cpp:2]: (error) Return value of allocation function 'malloc' is not stored.\n",
errout.str());

check("void f0(const bool b) { b ? new int : nullptr; }\n" // #11155
"void f1(const bool b) { b ? nullptr : new int; }\n"
"int* g0(const bool b) { return b ? new int : nullptr; }\n"
"void g1(const bool b) { h(b, b ? nullptr : new int); }\n");
ASSERT_EQUALS("[test.cpp:1]: (error) Return value of allocation function 'new' is not stored.\n"
"[test.cpp:2]: (error) Return value of allocation function 'new' is not stored.\n",
errout.str());
}

void smartPointerFunctionParam() {
Expand Down