Fix #12690 fuzzing timeout in Tokenizer::simplifyTypedef()

danmar · May 1, 2024 · b5604e9 · b5604e9
1 parent e4f7087
commit b5604e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8427,6 +8427,7 @@ void Tokenizer::findGarbageCode() const
                                                                          "goto",
                                                                          "if",
                                                                          "return",
+                                                                         "static",
                                                                          "switch",
                                                                          "throw",
                                                                          "typedef",
@@ -8510,7 +8511,7 @@ void Tokenizer::findGarbageCode() const
             if (Token::Match(prev, "%op%|%num%|%str%|%char%")) {
                 if (!Token::simpleMatch(tok->tokAt(-2), "operator \"\" if") &&
                     !Token::simpleMatch(tok->tokAt(-2), "extern \"C\"") &&
-                    !Token::simpleMatch(prev, "> typedef"))
+                    !Token::Match(prev, "> typedef|static"))
                     syntaxError(tok, prev == tok->previous() ? (prev->str() + " " + tok->str()) : (prev->str() + " .. " + tok->str()));
             }
         }

diff --git a/test/cli/fuzz-timeout/timeout-98121de84d1c09fdfd3697cdedcdd69bf6abc15d b/test/cli/fuzz-timeout/timeout-98121de84d1c09fdfd3697cdedcdd69bf6abc15d
@@ -0,0 +1 @@
+typedef static i i,n.i