Skip to content

Fix #11634 Crash in TypedefSimplifier #4938

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 3 commits into from
Apr 7, 2023
Merged

Fix #11634 Crash in TypedefSimplifier #4938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5198828
Fix #11634 Crash in TypedefSimplifier
chrchr-github Apr 6, 2023
c46ca04
Call function
chrchr-github Apr 6, 2023
1fabfad
Format
chrchr-github Apr 6, 2023
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
43 changes: 43 additions & 0 deletions lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,47 @@ void Tokenizer::simplifyUsingToTypedef()
}
}

void Tokenizer::simplifyTypedefLHS()
{
if (!list.front())
return;

for (Token* tok = list.front()->next(); tok; tok = tok->next()) {
if (tok->str() == "typedef") {
bool doSimplify = !Token::Match(tok->previous(), ";|{|}|:|public:|private:|protected:");
if (doSimplify && Token::simpleMatch(tok->previous(), ")") && Token::Match(tok->linkAt(-1)->previous(), "if|for|while"))
doSimplify = false;
bool haveStart = false;
Token* start{};
if (!doSimplify && Token::simpleMatch(tok->previous(), "}")) {
start = tok->linkAt(-1)->previous();
while (Token::Match(start, "%name%")) {
if (Token::Match(start, "class|struct|union|enum")) {
start = start->previous();
doSimplify = true;
haveStart = true;
break;
}
start = start->previous();
}
}
if (doSimplify) {
if (!haveStart) {
start = tok;
while (start && !Token::Match(start, "[;{}]"))
start = start->previous();
}
if (start)
start = start->next();
else
start = list.front();
start->insertTokenBefore(tok->str());
tok->deleteThis();
}
}
}
}

namespace {
class TypedefSimplifier {
private:
Expand Down Expand Up @@ -5423,6 +5464,8 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])

reportUnknownMacros();

simplifyTypedefLHS();

// typedef..
if (mTimerResults) {
Timer t("Tokenizer::tokenize::simplifyTypedef", mSettings->showtime, mTimerResults);
Expand Down
4 changes: 4 additions & 0 deletions lib/tokenize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,10 @@ class CPPCHECKLIB Tokenizer {
*/
void simplifyTypedef();
void simplifyTypedefCpp();
/**
* Move typedef token to the left og the expression
*/
void simplifyTypedefLHS();

/**
*/
Expand Down
23 changes: 19 additions & 4 deletions test/testsimplifytypedef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ class TestSimplifyTypedef : public TestFixture {
TEST_CASE(simplifyTypedef142); // T() when T is a pointer type
TEST_CASE(simplifyTypedef143); // #11506
TEST_CASE(simplifyTypedef144); // #9353
TEST_CASE(simplifyTypedef145); // #9353

TEST_CASE(simplifyTypedefFunction1);
TEST_CASE(simplifyTypedefFunction2); // ticket #1685
Expand Down Expand Up @@ -2022,10 +2023,7 @@ class TestSimplifyTypedef : public TestFixture {
}

void simplifyTypedef76() { // ticket #2453 segmentation fault
const char code[] = "void f1(typedef int x) {}";
const char expected[] = "void f1 ( typedef int x ) { }";
ASSERT_EQUALS(expected, tok(code, true, cppcheck::Platform::Type::Native, false));
ASSERT_EQUALS("", errout.str());
ASSERT_THROW(checkSimplifyTypedef("void f1(typedef int x) {}"), InternalError);
}

void simplifyTypedef77() { // ticket #2554
Expand Down Expand Up @@ -3254,6 +3252,23 @@ class TestSimplifyTypedef : public TestFixture {
ASSERT_EQUALS("struct X { } ; std :: vector < X > v ;", tok(code));
}

void simplifyTypedef145() { // #11634
const char* code{};
code = "int typedef i;\n"
"i main() {}\n";
ASSERT_EQUALS("int main ( ) { }", tok(code));

code = "struct {} typedef S;\n"
"void f() {\n"
" S();\n"
"}\n";
ASSERT_EQUALS("struct S { } ; void f ( ) { struct S ( ) ; }", tok(code));

code = "struct {} typedef S;\n" // don't crash
"S();\n";
ASSERT_EQUALS("struct S { } ; struct S ( ) ;", tok(code));
}

void simplifyTypedefFunction1() {
{
const char code[] = "typedef void (*my_func)();\n"
Expand Down