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

Check parameter validity in Object::set_script

Browse source 
Fixes #46120.

(cherry picked from commit 9c6c2f09e0)
This commit is contained in:
Angad Kambli 2021-02-17 21:17:57 +05:30 committed by Rémi Verschelde
parent 54640046a9
commit fe79dc90fc
No known key found for this signature in database
GPG key ID: C3336907360768E1
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.cpp
View file

@ -1004,14 +1004,16 @@ void Object::set_script(const RefPtr &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_instance()) { if (s->can_instance()) {
OBJ_DEBUG_LOCK OBJ_DEBUG_LOCK