|
@@ -1231,6 +1231,13 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
|
|
|
|
|
|
GD_ERR_BREAK(to_type < 0 || to_type >= Variant::VARIANT_MAX);
|
|
GD_ERR_BREAK(to_type < 0 || to_type >= Variant::VARIANT_MAX);
|
|
|
|
|
|
|
|
+#ifdef DEBUG_ENABLED
|
|
|
|
+ if (src->get_type() == Variant::OBJECT && !src->operator ObjectID().is_ref_counted() && ObjectDB::get_instance(src->operator ObjectID()) == nullptr) {
|
|
|
|
+ err_text = "Trying to cast a freed object.";
|
|
|
|
+ OPCODE_BREAK;
|
|
|
|
+ }
|
|
|
|
+#endif
|
|
|
|
+
|
|
Callable::CallError err;
|
|
Callable::CallError err;
|
|
Variant::construct(to_type, *dst, (const Variant **)&src, 1, err);
|
|
Variant::construct(to_type, *dst, (const Variant **)&src, 1, err);
|
|
|
|
|
|
@@ -1255,6 +1262,10 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
|
|
GD_ERR_BREAK(!nc);
|
|
GD_ERR_BREAK(!nc);
|
|
|
|
|
|
#ifdef DEBUG_ENABLED
|
|
#ifdef DEBUG_ENABLED
|
|
|
|
+ if (src->get_type() == Variant::OBJECT && !src->operator ObjectID().is_ref_counted() && ObjectDB::get_instance(src->operator ObjectID()) == nullptr) {
|
|
|
|
+ err_text = "Trying to cast a freed object.";
|
|
|
|
+ OPCODE_BREAK;
|
|
|
|
+ }
|
|
if (src->get_type() != Variant::OBJECT && src->get_type() != Variant::NIL) {
|
|
if (src->get_type() != Variant::OBJECT && src->get_type() != Variant::NIL) {
|
|
err_text = "Invalid cast: can't convert a non-object value to an object type.";
|
|
err_text = "Invalid cast: can't convert a non-object value to an object type.";
|
|
OPCODE_BREAK;
|
|
OPCODE_BREAK;
|
|
@@ -1283,6 +1294,10 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
|
|
GD_ERR_BREAK(!base_type);
|
|
GD_ERR_BREAK(!base_type);
|
|
|
|
|
|
#ifdef DEBUG_ENABLED
|
|
#ifdef DEBUG_ENABLED
|
|
|
|
+ if (src->get_type() == Variant::OBJECT && !src->operator ObjectID().is_ref_counted() && ObjectDB::get_instance(src->operator ObjectID()) == nullptr) {
|
|
|
|
+ err_text = "Trying to cast a freed object.";
|
|
|
|
+ OPCODE_BREAK;
|
|
|
|
+ }
|
|
if (src->get_type() != Variant::OBJECT && src->get_type() != Variant::NIL) {
|
|
if (src->get_type() != Variant::OBJECT && src->get_type() != Variant::NIL) {
|
|
err_text = "Trying to assign a non-object value to a variable of type '" + base_type->get_path().get_file() + "'.";
|
|
err_text = "Trying to assign a non-object value to a variable of type '" + base_type->get_path().get_file() + "'.";
|
|
OPCODE_BREAK;
|
|
OPCODE_BREAK;
|