asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #74330 from aleksrutins/csharp-identifier-validation

Browse source 
Ensure that C# script names (and therefore class names) are valid identifiers
This commit is contained in:
Rémi Verschelde 2023-03-05 13:29:26 +01:00
commit b2622218f9
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/mono/csharp_script.cpp
View file

@ -58,6 +58,7 @@
#include "godotsharp_dirs.h" #include "godotsharp_dirs.h"
#include "managed_callable.h" #include "managed_callable.h"
#include "mono_gd/gd_mono_cache.h" #include "mono_gd/gd_mono_cache.h"
#include "servers/text_server.h"
#include "signal_awaiter_utils.h" #include "signal_awaiter_utils.h"
#include "utils/macros.h" #include "utils/macros.h"
#include "utils/naming_utils.h" #include "utils/naming_utils.h"
@ -374,6 +375,10 @@ String CSharpLanguage::validate_path(const String &p_path) const {
if (keywords.find(class_name)) { if (keywords.find(class_name)) {
return RTR("Class name can't be a reserved keyword"); return RTR("Class name can't be a reserved keyword");
} }
if (!TS->is_valid_identifier(class_name)) {
return RTR("Class name must be a valid identifier");
}
return ""; return "";
} }