Browse Source

Merge pull request #659 from groud/fix_null_init

Avoid crash in Variant constructor from nullptr Object*
Bastiaan Olij 3 years ago
parent
commit
50512f0dee
1 changed files with 6 additions and 1 deletions
  1. 6 1
      src/variant/variant.cpp

+ 6 - 1
src/variant/variant.cpp

@@ -171,7 +171,12 @@ Variant::Variant(const godot::RID &v) {
 }
 }
 
 
 Variant::Variant(const Object *v) {
 Variant::Variant(const Object *v) {
-	from_type_constructor[OBJECT](ptr(), const_cast<GodotObject **>(&v->_owner));
+	if (v) {
+		from_type_constructor[OBJECT](ptr(), const_cast<GodotObject **>(&v->_owner));
+	} else {
+		GodotObject *nullobject = nullptr;
+		from_type_constructor[OBJECT](ptr(), &nullobject);
+	}
 }
 }
 
 
 Variant::Variant(const Callable &v) {
 Variant::Variant(const Callable &v) {