Fix #12631 fuzzing timeout in Tokenizer::simplifyTypedefCpp() (#6312)

chrchr-github · web-flow · commit ba9216ee2502 · 2024-04-21T10:55:26.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8667,6 +8667,8 @@ void Tokenizer::findGarbageCode() const
             if (Token::Match(tok->next(), ")|]|>|%assign%|%or%|%oror%|==|!=|/|>=|<=|&&"))
                 syntaxError(tok);
         }
+        if ((!isCPP() || !Token::simpleMatch(tok->previous(), "operator")) && Token::Match(tok, "[,;] ,"))
+            syntaxError(tok);
         if (Token::simpleMatch(tok, ".") &&
             !Token::simpleMatch(tok->previous(), ".") &&
             !Token::simpleMatch(tok->next(), ".") &&
diff --git a/test/cli/fuzz-timeout/timeout-90ec15c5629f957bf2d497bc9f60c57f252bd2ae b/test/cli/fuzz-timeout/timeout-90ec15c5629f957bf2d497bc9f60c57f252bd2ae
@@ -0,0 +1 @@
+ ama typedef f  m ef ef dz e dz e e ef   ef  m ef dz e,,,,m  ef dz e,,,,,K 

Original file line number	Diff line number	Diff line change
`@@ -8667,6 +8667,8 @@ void Tokenizer::findGarbageCode() const`
`8667`	`8667`	`if (Token::Match(tok->next(), ")\|]\|>\|%assign%\|%or%\|%oror%\|==\|!=\|/\|>=\|<=\|&&"))`
`8668`	`8668`	`syntaxError(tok);`
`8669`	`8669`	`}`
	`8670`	`+ if ((!isCPP() \|\| !Token::simpleMatch(tok->previous(), "operator")) && Token::Match(tok, "[,;] ,"))`
	`8671`	`+ syntaxError(tok);`
`8670`	`8672`	`if (Token::simpleMatch(tok, ".") &&`
`8671`	`8673`	`!Token::simpleMatch(tok->previous(), ".") &&`
`8672`	`8674`	`!Token::simpleMatch(tok->next(), ".") &&`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ ama typedef f m ef ef dz e dz e e ef ef m ef dz e,,,,m ef dz e,,,,,K`