Merge pull request #659 from groud/fix_null_init

BastiaanOlij · web-flow · commit 50512f0dee7c · 2021-11-25T11:16:55.000+11:00
Avoid crash in Variant constructor from nullptr Object*
diff --git a/src/variant/variant.cpp b/src/variant/variant.cpp
@@ -171,7 +171,12 @@ Variant::Variant(const godot::RID &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) {

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,12 @@ Variant::Variant(const godot::RID &v) {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`Variant::Variant(const Object *v) {`
`174`		`- from_type_constructor[OBJECT](ptr(), const_cast<GodotObject **>(&v->_owner));`
	`174`	`+ if (v) {`
	`175`	`+ from_type_constructor[OBJECT](ptr(), const_cast<GodotObject **>(&v->_owner));`
	`176`	`+ } else {`
	`177`	`+ GodotObject *nullobject = nullptr;`
	`178`	`+ from_type_constructor[OBJECT](ptr(), &nullobject);`
	`179`	`+ }`
`175`	`180`	`}`
`176`	`181`
`177`	`182`	`Variant::Variant(const Callable &v) {`