Fix fuzzing crashes

chrchr-github · chrchr-github · commit ebc0d9f1e82f · 2024-03-24T02:16:34.000+01:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8641,7 +8641,7 @@ void Tokenizer::findGarbageCode() const
             syntaxError(tok);
         if (Token::Match(tok, "==|!=|<=|>= %comp%") && tok->strAt(-1) != "operator")
             syntaxError(tok, tok->str() + " " + tok->strAt(1));
-        if (Token::simpleMatch(tok, ":: ::"))
+        if (Token::simpleMatch(tok, "::") && (!Token::match(tok->next(), "%name%") || tok->next()->isKeyword()))
             syntaxError(tok);
     }
 
diff --git a/test/cli/fuzz-crash/crash-19219d7e7dfe8202248cd22229cdd9a2fd87a78a b/test/cli/fuzz-crash/crash-19219d7e7dfe8202248cd22229cdd9a2fd87a78a
@@ -0,0 +1 @@
+n::template u
diff --git a/test/cli/fuzz-crash/crash-77a4e4ffd476997f06f67e4a18b5d4eedfa71900 b/test/cli/fuzz-crash/crash-77a4e4ffd476997f06f67e4a18b5d4eedfa71900
@@ -0,0 +1 @@
+n i(){t i=0-::-t}

Original file line number	Diff line number	Diff line change
`@@ -8641,7 +8641,7 @@ void Tokenizer::findGarbageCode() const`
`8641`	`8641`	`syntaxError(tok);`
`8642`	`8642`	`if (Token::Match(tok, "==\|!=\|<=\|>= %comp%") && tok->strAt(-1) != "operator")`
`8643`	`8643`	`syntaxError(tok, tok->str() + " " + tok->strAt(1));`
`8644`		`- if (Token::simpleMatch(tok, ":: ::"))`
	`8644`	`+ if (Token::simpleMatch(tok, "::") && (!Token::match(tok->next(), "%name%") \|\| tok->next()->isKeyword()))`
`8645`	`8645`	`syntaxError(tok);`
`8646`	`8646`	`}`
`8647`	`8647`