1 files changed, 38 insertions, 6 deletions

diff --git a/modules/gdscript/gdscript_lambda_callable.cpp b/modules/gdscript/gdscript_lambda_callable.cpp
index 9d0fce0928..f6fa17c84f 100644
--- a/modules/gdscript/gdscript_lambda_callable.cpp
+++ b/modules/gdscript/gdscript_lambda_callable.cpp
@@ -44,11 +44,18 @@ bool GDScriptLambdaCallable::compare_less(const CallableCustom *p_a, const Calla
 	return p_a < p_b;
 }
 
+bool GDScriptLambdaCallable::is_valid() const {
+	return CallableCustom::is_valid() && function != nullptr;
+}
+
 uint32_t GDScriptLambdaCallable::hash() const {
 	return h;
 }
 
 String GDScriptLambdaCallable::get_as_text() const {
+	if (function == nullptr) {
+		return "<invalid lambda>";
+	}
 	if (function->get_name() != StringName()) {
 		return function->get_name().operator String() + "(lambda)";
 	}
@@ -74,6 +81,12 @@ StringName GDScriptLambdaCallable::get_method() const {
 void GDScriptLambdaCallable::call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const {
 	int captures_amount = captures.size();
 
+	if (function == nullptr) {
+		r_return_value = Variant();
+		r_call_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+		return;
+	}
+
 	if (captures_amount > 0) {
 		Vector<const Variant *> args;
 		args.resize(p_argcount + captures_amount);
@@ -126,9 +139,11 @@ void GDScriptLambdaCallable::call(const Variant **p_arguments, int p_argcount, V
 	}
 }
 
-GDScriptLambdaCallable::GDScriptLambdaCallable(Ref<GDScript> p_script, GDScriptFunction *p_function, const Vector<Variant> &p_captures) {
+GDScriptLambdaCallable::GDScriptLambdaCallable(Ref<GDScript> p_script, GDScriptFunction *p_function, const Vector<Variant> &p_captures) :
+		function(p_function) {
+	ERR_FAIL_NULL(p_script.ptr());
+	ERR_FAIL_NULL(p_function);
 	script = p_script;
-	function = p_function;
 	captures = p_captures;
 
 	h = (uint32_t)hash_murmur3_one_64((uint64_t)this);
@@ -144,11 +159,18 @@ bool GDScriptLambdaSelfCallable::compare_less(const CallableCustom *p_a, const C
 	return p_a < p_b;
 }
 
+bool GDScriptLambdaSelfCallable::is_valid() const {
+	return CallableCustom::is_valid() && function != nullptr;
+}
+
 uint32_t GDScriptLambdaSelfCallable::hash() const {
 	return h;
 }
 
 String GDScriptLambdaSelfCallable::get_as_text() const {
+	if (function == nullptr) {
+		return "<invalid lambda>";
+	}
 	if (function->get_name() != StringName()) {
 		return function->get_name().operator String() + "(lambda)";
 	}
@@ -178,6 +200,12 @@ void GDScriptLambdaSelfCallable::call(const Variant **p_arguments, int p_argcoun
 
 	int captures_amount = captures.size();
 
+	if (function == nullptr) {
+		r_return_value = Variant();
+		r_call_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+		return;
+	}
+
 	if (captures_amount > 0) {
 		Vector<const Variant *> args;
 		args.resize(p_argcount + captures_amount);
@@ -230,18 +258,22 @@ void GDScriptLambdaSelfCallable::call(const Variant **p_arguments, int p_argcoun
 	}
 }
 
-GDScriptLambdaSelfCallable::GDScriptLambdaSelfCallable(Ref<RefCounted> p_self, GDScriptFunction *p_function, const Vector<Variant> &p_captures) {
+GDScriptLambdaSelfCallable::GDScriptLambdaSelfCallable(Ref<RefCounted> p_self, GDScriptFunction *p_function, const Vector<Variant> &p_captures) :
+		function(p_function) {
+	ERR_FAIL_NULL(p_self.ptr());
+	ERR_FAIL_NULL(p_function);
 	reference = p_self;
 	object = p_self.ptr();
-	function = p_function;
 	captures = p_captures;
 
 	h = (uint32_t)hash_murmur3_one_64((uint64_t)this);
 }
 
-GDScriptLambdaSelfCallable::GDScriptLambdaSelfCallable(Object *p_self, GDScriptFunction *p_function, const Vector<Variant> &p_captures) {
+GDScriptLambdaSelfCallable::GDScriptLambdaSelfCallable(Object *p_self, GDScriptFunction *p_function, const Vector<Variant> &p_captures) :
+		function(p_function) {
+	ERR_FAIL_NULL(p_self);
+	ERR_FAIL_NULL(p_function);
 	object = p_self;
-	function = p_function;
 	captures = p_captures;
 
 	h = (uint32_t)hash_murmur3_one_64((uint64_t)this);