godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check parameter validity in `Object::set_script` 

Fixes #46120.

(cherry picked from commit 9c6c2f09e0)
This commit is contained in:
Angad Kambli 2021-02-17 21:17:57 +05:30 committed by Yuri Sizov
parent 4c1c26979b
commit cdeddffee7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/object/object.cpp
View File

@ -836,14 +836,16 @@ void Object::set_script(const Variant &p_script) {
return; return;
} }
Ref<Script> s = p_script;
ERR_FAIL_COND_MSG(s.is_null() && !p_script.is_null(), "Invalid parameter, it should be a reference to a valid script (or null).");
script = p_script;
if (script_instance) { if (script_instance) {
memdelete(script_instance); memdelete(script_instance);
script_instance = nullptr; script_instance = nullptr;
} }
script = p_script;
Ref<Script> s = script;
if (!s.is_null()) { if (!s.is_null()) {
if (s->can_instantiate()) { if (s->can_instantiate()) {
OBJ_DEBUG_LOCK OBJ_DEBUG_LOCK