Skip to content

Fix #11039 Empty AST with delete new / #11327 FP leakReturnValNotUsed with new and offset #4513

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 7 commits into from
Sep 27, 2022
Merged

Fix #11039 Empty AST with delete new / #11327 FP leakReturnValNotUsed with new and offset #4513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
46578c5
Fix internalAstError with new
chrchr-github Sep 26, 2022
f981c10
Format
chrchr-github Sep 26, 2022
ac7503d
nullptr check
chrchr-github Sep 26, 2022
a8c7db6
Add test for #11039
chrchr-github Sep 27, 2022
93fdcfd
Fix #11039 Empty AST with delete new / #11327 FP leakReturnValNotUsed…
chrchr-github Sep 27, 2022
7cf0f7c
Merge branch 'chr_Fix11030' of https://github.com/chrchr-github/cppch…
chrchr-github Sep 27, 2022
0b4bd41
Merge
chrchr-github Sep 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
5 changes: 4 additions & 1 deletion lib/tokenlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,8 @@ static bool iscast(const Token *tok, bool cpp)
for (const Token *tok2 = tok->next(); tok2; tok2 = tok2->next()) {
if (tok2->varId() != 0)
return false;
if (cpp && !type && tok2->str() == "new")
return false;

while (tok2->link() && Token::Match(tok2, "(|[|<"))
tok2 = tok2->link()->next();
Expand Down Expand Up @@ -1620,7 +1622,8 @@ static Token * createAstAtToken(Token *tok, bool cpp)
Token::Match(tok, "%name% %op%|(|[|.|::|<|?|;") ||
(cpp && Token::Match(tok, "%name% {") && iscpp11init(tok->next())) ||
Token::Match(tok->previous(), "[;{}] %cop%|++|--|( !!{") ||
Token::Match(tok->previous(), "[;{}] %num%|%str%|%char%")) {
Token::Match(tok->previous(), "[;{}] %num%|%str%|%char%") ||
Token::Match(tok->previous(), "[;{}] delete new")) {
if (cpp && (Token::Match(tok->tokAt(-2), "[;{}] new|delete %name%") || Token::Match(tok->tokAt(-3), "[;{}] :: new|delete %name%")))
tok = tok->previous();

Expand Down
11 changes: 11 additions & 0 deletions test/testmemleak.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2666,6 +2666,17 @@ class TestMemleakNoVar : public TestFixture {
" Ref<StringBuffer> remove(new StringBuffer());\n"
"}\n");
ASSERT_EQUALS("", errout.str());

check("void f() {\n" // #11039
" delete new int;\n"
"}\n");
ASSERT_EQUALS("", errout.str());

check("void f() {\n" // #11327
" int* p = (new int[3]) + 1;\n"
" delete[] &p[-1];\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}

void smartPointerFunctionParam() {
Expand Down
3 changes: 3 additions & 0 deletions test/testtokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6074,6 +6074,9 @@ class TestTokenizer : public TestFixture {
ASSERT_EQUALS("a0[T{new=", testAst("a[0] = new T{};"));
ASSERT_EQUALS("a0[T::{new=", testAst("a[0] = new ::T{};"));
ASSERT_EQUALS("a0[ST::{new=", testAst("a[0] = new S::T{};"));
ASSERT_EQUALS("intnewdelete", testAst("delete new int;")); // #11039
ASSERT_EQUALS("intnewdelete", testAst("void f() { delete new int; }"));
ASSERT_EQUALS("pint3[new1+=", testAst("p = (new int[3]) + 1;")); // #11327

// placement new
ASSERT_EQUALS("X12,3,(new ab,c,", testAst("new (a,b,c) X(1,2,3);"));
Expand Down