Merge pull request #47576 from jmb462/fix-classDB-class_get_property-…

…crash Fix crash on null object in ClassDB.get_property() and set_property() (Fix #47573)
godotengine · Apr 2, 2021 · 9859f6d · 9859f6d
2 parents 8610867 + 400843c
commit 9859f6d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/core/object/class_db.cpp b/core/object/class_db.cpp
@@ -1095,6 +1095,8 @@ bool ClassDB::get_property_info(StringName p_class, StringName p_property, Prope
 }
 
 bool ClassDB::set_property(Object *p_object, const StringName &p_property, const Variant &p_value, bool *r_valid) {
+	ERR_FAIL_NULL_V(p_object, false);
+
 	ClassInfo *type = classes.getptr(p_object->get_class_name());
 	ClassInfo *check = type;
 	while (check) {
@@ -1142,6 +1144,8 @@ bool ClassDB::set_property(Object *p_object, const StringName &p_property, const
 }
 
 bool ClassDB::get_property(Object *p_object, const StringName &p_property, Variant &r_value) {
+	ERR_FAIL_NULL_V(p_object, false);
+
 	ClassInfo *type = classes.getptr(p_object->get_class_name());
 	ClassInfo *check = type;
 	while (check) {