Skip to content

Fix #14914: fuzzing timeout (hang) in Tokenizer::simplifyTypedef() #8762

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
ludviggunne wants to merge 3 commits into
base: main
Choose a base branch
from
+22 −14
Open

Fix #14914: fuzzing timeout (hang) in Tokenizer::simplifyTypedef() #8762

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
6e142ba
add fuzz file
ludviggunne Jul 28, 2026
1c14c73
add test
ludviggunne Jul 28, 2026
861ce88
fix
ludviggunne 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
29 changes: 15 additions & 14 deletions lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,20 @@ namespace {
if (Token::simpleMatch(start, "typename"))
start = start->next();

const auto checkForRecursion = [this]() {
if (Token::Match(mTypedefToken, "typedef %name% %name% ;"))
return;
for (const Token *tok = mTypedefToken; tok != mEndToken; tok = tok->next()) {
if (tok == mNameToken)
continue;
if (tok->str() != mNameToken->str())
continue;
if (Token::Match(tok->previous(), "struct|class|enum|union"))
continue;
throw InternalError(tok, "recursive typedef encountered");
}
};

// TODO handle unnamed structs etc
if (Token::Match(start, "const| enum|struct|union|class %name%| {")) {
const std::pair<const Token*, Token*> rangeBefore(start, Token::findsimplematch(start, "{"));
Expand All @@ -585,24 +599,11 @@ namespace {
}
mNameToken = nameTok;
mEndToken = nameTok->next();
checkForRecursion();
return;
}
}

const auto checkForRecursion = [this]() {
if (Token::Match(mTypedefToken, "typedef %name% %name% ;"))
return;
for (const Token *tok = mTypedefToken; tok != mEndToken; tok = tok->next()) {
if (tok == mNameToken)
continue;
if (tok->str() != mNameToken->str())
continue;
if (Token::Match(tok->previous(), "struct|class|enum|union"))
continue;
throw InternalError(tok, "recursive typedef encountered");
}
};

for (Token* type = start; Token::Match(type, "%name%|*|&|&&"); type = type->next()) {
if (type != start && Token::Match(type, "%name% ;") && !type->isStandardType()) {
mRangeType.first = start;
Expand Down
1 change: 1 addition & 0 deletions test/cli/fuzz-timeout/oom-6fd8356f0baeb3bb43463298803b94ac8ea93cac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
typedef struct D{itoftor;}tor tor;
6 changes: 6 additions & 0 deletions test/testsimplifytypedef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ class TestSimplifyTypedef : public TestFixture {
TEST_CASE(simplifyTypedef161);
TEST_CASE(simplifyTypedef162);
TEST_CASE(simplifyTypedef163);
TEST_CASE(simplifyTypedef164);

TEST_CASE(simplifyTypedefFunction1);
TEST_CASE(simplifyTypedefFunction2); // ticket #1685
Expand Down Expand Up @@ -3874,6 +3875,11 @@ class TestSimplifyTypedef : public TestFixture {
ASSERT_THROW_INTERNAL(tok(code), INTERNAL);
}

void simplifyTypedef164() {
const char code[] = "typedef struct D{x;}y y;";
ASSERT_THROW_INTERNAL(tok(code), INTERNAL);
}

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