Browse Source

Merge pull request #204 from bruvzg/fix_ref_2_variant

Fix NULL pointer dereferencing on uninstantiated Ref<T>() conversion to Variant
Bastiaan Olij 6 years ago
parent
commit
1d3dbf2c51
1 changed files with 4 additions and 1 deletions
  1. 4 1
      src/core/Variant.cpp

+ 4 - 1
src/core/Variant.cpp

@@ -142,7 +142,10 @@ Variant::Variant(const RID& p_rid)
 
 
 Variant::Variant(const Object* p_object)
 Variant::Variant(const Object* p_object)
 {
 {
-	godot::api->godot_variant_new_object(&_godot_variant, p_object->_owner);
+	if (p_object)
+		godot::api->godot_variant_new_object(&_godot_variant, p_object->_owner);
+	else
+		godot::api->godot_variant_new_nil(&_godot_variant);
 }
 }
 
 
 Variant::Variant(const Dictionary& p_dictionary)
 Variant::Variant(const Dictionary& p_dictionary)