Bladeren bron

Merge pull request #54157 from bjauny/fix_potential_nullpointer_collision3d

Fix potential null pointer use, based on #54094 fix
Camille Mohr-Daurat 3 jaren geleden
bovenliggende
commit
3c527dcbbd
2 gewijzigde bestanden met toevoegingen van 6 en 2 verwijderingen
  1. 3 1
      scene/2d/collision_object_2d.cpp
  2. 3 1
      scene/3d/collision_object_3d.cpp

+ 3 - 1
scene/2d/collision_object_2d.cpp

@@ -50,7 +50,9 @@ void CollisionObject2D::_notification(int p_what) {
 			}
 
 			if (!disabled || (disable_mode != DISABLE_MODE_REMOVE)) {
-				RID space = get_world_2d()->get_space();
+				Ref<World2D> world_ref = get_world_2d();
+				ERR_FAIL_COND(!world_ref.is_valid());
+				RID space = world_ref->get_space();
 				if (area) {
 					PhysicsServer2D::get_singleton()->area_set_space(rid, space);
 				} else {

+ 3 - 1
scene/3d/collision_object_3d.cpp

@@ -64,7 +64,9 @@ void CollisionObject3D::_notification(int p_what) {
 			}
 
 			if (!disabled || (disable_mode != DISABLE_MODE_REMOVE)) {
-				RID space = get_world_3d()->get_space();
+				Ref<World3D> world_ref = get_world_3d();
+				ERR_FAIL_COND(!world_ref.is_valid());
+				RID space = world_ref->get_space();
 				if (area) {
 					PhysicsServer3D::get_singleton()->area_set_space(rid, space);
 				} else {