Skip to content

Partial fix for #14842 FN memleak in function with trailing return type (regression) #8651

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

Open
chrchr-github wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −0
Open

Partial fix for #14842 FN memleak in function with trailing return type (regression) #8651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7368,6 +7368,8 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
Token* lambdaEnd = findLambdaEndScope(lambdaStart);
if (lambdaEnd)
simplifyVarDecl(lambdaEnd->link()->next(), lambdaEnd, only_k_r_fpar);
else
simplifyVarDecl(tok->tokAt(2), tok->linkAt(1), only_k_r_fpar);
} else {
for (Token* tok2 = tok->next(); tok2 != tok->linkAt(1); tok2 = tok2->next()) {
Token* lambdaEnd = findLambdaEndScope(tok2);
Expand Down
14 changes: 14 additions & 0 deletions test/testtokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ class TestTokenizer : public TestFixture {
TEST_CASE(vardecl32);
TEST_CASE(vardecl33);
TEST_CASE(vardecl34);
TEST_CASE(vardecl35);
TEST_CASE(vardecl_stl_1);
TEST_CASE(vardecl_stl_2);
TEST_CASE(vardecl_stl_3);
Expand Down Expand Up @@ -2856,6 +2857,19 @@ class TestTokenizer : public TestFixture {
ASSERT_EQUALS("enum Anonymous0 { E } ; static enum Anonymous0 const * f ( ) { return NULL ; }", tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
}
}
void vardecl35() { // #14842
{
const char code[] = "auto f() -> void {\n"
" auto p = new int;\n"
" *p = 0;\n"
"}\n";
ASSERT_EQUALS("auto f ( ) . void {\n"
"auto p ; p = new int ;\n"
"* p = 0 ;\n"
"}", tokenizeAndStringify(code));
ignore_errout();
}
}

void volatile_variables() {
{
Expand Down
Loading