Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-03 07:01:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix VariantInternal initialization and setting of object

Browse source 
- Initialize Object pointer to nullptr so it's not used by mistake.
- When setting an Object check if it's a reference so refcounting works
  as intended.
This commit is contained in:
George Marques 2020-11-30 14:27:44 -03:00
parent b9a2787bd1
commit 029fd88adb
No known key found for this signature in database
GPG key ID: 046BD46A3201E43D
3 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

25
core/variant/variant_construct.cpp
View file

@ -777,18 +777,23 @@ String Variant::get_constructor_argument_name(Variant::Type p_type, int p_constr
return construct_data[p_type][p_constructor].arg_names[p_argument];
}
void VariantInternal::object_assign(Variant *v, const Variant *o) {
if (o->_get_obj().obj && o->_get_obj().id.is_reference()) {
Reference *reference = static_cast<Reference *>(o->_get_obj().obj);
if (!reference->reference()) {
v->_get_obj().obj = nullptr;
v->_get_obj().id = ObjectID();
return;
void VariantInternal::object_assign(Variant *v, const Object *o) {
if (o) {
if (o->is_reference()) {
Reference *reference = const_cast<Reference *>(static_cast<const Reference *>(o));
if (!reference->init_ref()) {
v->_get_obj().obj = nullptr;
v->_get_obj().id = ObjectID();
return;
}
}
}
v->_get_obj().obj = const_cast<Object *>(o->_get_obj().obj);
v->_get_obj().id = o->_get_obj().id;
v->_get_obj().obj = const_cast<Object *>(o);
v->_get_obj().id = o->get_instance_id();
} else {
v->_get_obj().obj = nullptr;
v->_get_obj().id = ObjectID();
}
}
void Variant::get_constructor_list(Type p_type, List<MethodInfo> *r_list) {