summaryrefslogtreecommitdiffstats
path: root/src/core/Variant.cpp
diff options
context:
space:
mode:
authorbruvzg <7645683+bruvzg@users.noreply.github.com>2018-11-22 23:41:33 +0200
committerbruvzg <7645683+bruvzg@users.noreply.github.com>2018-11-22 23:41:33 +0200
commitc2b59773af525161d4dd3f1dd9baac179f1afda9 (patch)
tree4d8181982c2a5f72aa383fa9ec5b5981b1ad296b /src/core/Variant.cpp
parentf10ce0a6be60bf5ea3d20cc5d4b1cbc442a42e7c (diff)
downloadredot-cpp-c2b59773af525161d4dd3f1dd9baac179f1afda9.tar.gz
Fix NULL pointer dereferencing on uninstantiated Ref<T>() conversion to Variant
Diffstat (limited to 'src/core/Variant.cpp')
-rw-r--r--src/core/Variant.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/Variant.cpp b/src/core/Variant.cpp
index 8519ceb..4f88951 100644
--- a/src/core/Variant.cpp
+++ b/src/core/Variant.cpp
@@ -142,7 +142,10 @@ Variant::Variant(const RID& p_rid)
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)