[Shaders] Disallow trailing commas in function declarations

godotengine · Sep 6, 2024 · 6b8c867 · 6b8c867
1 parent 05d9854
commit 6b8c867
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp
@@ -10066,7 +10066,13 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
 
 					if (tk.type == TK_COMMA) {
 						tk = _get_token();
-						//do none and go on
+#ifdef DISABLE_DEPRECATED
+						// Disallow trailing comma.
+						if (tk.type == TK_PARENTHESIS_CLOSE) {
+							_set_error(RTR("Expected a valid data type for argument. Trailing commas are not allowed."));
+							return ERR_PARSE_ERROR;
+						}
+#endif
 					} else if (tk.type != TK_PARENTHESIS_CLOSE) {
 						_set_expected_error(",", ")");
 						return ERR_PARSE_ERROR;