diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2016-10-04 15:02:36 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2016-10-04 16:07:45 +0200 |
| commit | e59820ac94b7c9706298d5559608937dfca332e5 (patch) | |
| tree | 6e4cf8e3940a5a1d8d0cd1d7cf7ca8053f34d2f8 /modules/gdscript/gd_functions.cpp | |
| parent | 78d97b060a6873a454e710380cb9ef1bde5e4c65 (diff) | |
| download | redot-engine-e59820ac94b7c9706298d5559608937dfca332e5.tar.gz | |
Add warning when (pre)loading paths with leading / (#4280 - #3106)
Diffstat (limited to 'modules/gdscript/gd_functions.cpp')
| -rw-r--r-- | modules/gdscript/gd_functions.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp index a565e866d0..0369e323bc 100644 --- a/modules/gdscript/gd_functions.cpp +++ b/modules/gdscript/gd_functions.cpp @@ -840,8 +840,13 @@ void GDFunctions::call(Function p_func,const Variant **p_args,int p_arg_count,Va r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.argument=0; r_ret=Variant(); + } else if(((String)(*p_args[0])).begins_with("/")) { + r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; + r_error.argument=0; + r_ret=RTR("Paths cannot start with '/', absolute paths must start with \'res://\', \'user://\', or \'local://\'"); + } else { + r_ret=ResourceLoader::load(*p_args[0]); } - r_ret=ResourceLoader::load(*p_args[0]); } break; case INST2DICT: { |