Merge pull request #46125 from angad-k/fix-object-to-check-script-poi…

…nter-validity Check parameter validity in `Object::set_script`
godotengine · Jul 8, 2023 · 7e39c91 · 7e39c91
2 parents c3b0a92 + 9c6c2f0
commit 7e39c91
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/core/object/object.cpp b/core/object/object.cpp
@@ -836,14 +836,16 @@ void Object::set_script(const Variant &p_script) {
 		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) {
 		memdelete(script_instance);
 		script_instance = nullptr;
 	}
 
-	script = p_script;
-	Ref<Script> s = script;
-
 	if (!s.is_null()) {
 		if (s->can_instantiate()) {
 			OBJ_DEBUG_LOCK