maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6702 from Faless/load_error_leading_slash

Browse source 
Add error when (pre)loading paths with leading / (#4280 - #3106)
This commit is contained in:
Rémi Verschelde 2016-10-09 14:16:47 +02:00 committed by GitHub
parent a3bac99c1c e59820ac94
commit fda72354c9
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/gdscript/gd_functions.cpp
View file

@ -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: {

8
modules/gdscript/gd_parser.cpp
View file

@ -307,6 +307,10 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
_set_error("expected string constant as 'preload' argument.");
return NULL;
}
if (path.begins_with("/")) {
_set_error("Paths cannot start with '/', absolute paths must start with \'res://\', \'user://\', or \'local://\'");
return NULL;
}
if (!path.is_abs_path() && base_path!="")
path=base_path+"/"+path;
path = path.replace("///","//").simplify_path();
@ -2109,6 +2113,10 @@ void GDParser::_parse_extends(ClassNode *p_class) {
_set_error("'extends' constant must be a string.");
return;
}
if (((String)(constant)).begins_with("/")) {
_set_error("Paths cannot start with '/', absolute paths must start with \'res://\', \'user://\', or \'local://\'");
return;
}
p_class->extends_file=constant;
tokenizer->advance();