Fix #12801 fuzzing timeout/out-of-memory in Tokenizer::simplifyTypede…

…fCpp() (#6475)
danmar · Jun 2, 2024 · 7eda773 · 7eda773
1 parent edf0104
commit 7eda773
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8752,6 +8752,13 @@ void Tokenizer::findGarbageCode() const
                 }
                 if (!tok2->next() || tok2->isControlFlowKeyword() || Token::Match(tok2, "typedef|static|."))
                     syntaxError(tok);
+                if (Token::Match(tok2, "%name% %name%") && tok2->str() == tok2->strAt(1)) {
+                    if (tok2->isStandardType() && tok2->str() == "long")
+                        continue;
+                    if (Token::Match(tok2->tokAt(-1), "enum|struct|union") || (isCPP() && Token::Match(tok2->tokAt(-1), "class|::")))
+                        continue;
+                    syntaxError(tok2);
+                }
             }
         }
         if (cpp && tok->str() == "namespace" && tok->tokAt(-1)) {

diff --git a/test/cli/fuzz-timeout/timeout-faa72062ab3f26df7305d72eed55a69f7f0dfbf0 b/test/cli/fuzz-timeout/timeout-faa72062ab3f26df7305d72eed55a69f7f0dfbf0
@@ -0,0 +1 @@
+typedef q k k k q,q k,q,k,q,k,q k,q,k,q,k,;