Merge pull request #46264 from nmrkr/build-planes-axes-check

Fix unchecked array access in build_*_planes
This commit is contained in:
Rémi Verschelde 2021-02-22 21:42:17 +01:00 committed by GitHub
commit c5a88e6e91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -775,6 +775,8 @@ Vector<Plane> Geometry3D::build_box_planes(const Vector3 &p_extents) {
}
Vector<Plane> Geometry3D::build_cylinder_planes(real_t p_radius, real_t p_height, int p_sides, Vector3::Axis p_axis) {
ERR_FAIL_INDEX_V(p_axis, 3, Vector<Plane>());
Vector<Plane> planes;
const double sides_step = Math_TAU / p_sides;
@ -796,6 +798,8 @@ Vector<Plane> Geometry3D::build_cylinder_planes(real_t p_radius, real_t p_height
}
Vector<Plane> Geometry3D::build_sphere_planes(real_t p_radius, int p_lats, int p_lons, Vector3::Axis p_axis) {
ERR_FAIL_INDEX_V(p_axis, 3, Vector<Plane>());
Vector<Plane> planes;
Vector3 axis;
@ -827,6 +831,8 @@ Vector<Plane> Geometry3D::build_sphere_planes(real_t p_radius, int p_lats, int p
}
Vector<Plane> Geometry3D::build_capsule_planes(real_t p_radius, real_t p_height, int p_sides, int p_lats, Vector3::Axis p_axis) {
ERR_FAIL_INDEX_V(p_axis, 3, Vector<Plane>());
Vector<Plane> planes;
Vector3 axis;