diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-22 21:42:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 21:42:17 +0100 |
| commit | c5a88e6e91ca9c500dc920a4c0e3e27ae1f90cd6 (patch) | |
| tree | 09533adb6a67fe70fc844e1ea353214a1ab45961 /core | |
| parent | 88ee248db01851e29469948eee2f7e0944ac1714 (diff) | |
| parent | f054f760e64b3b1768e9f8b6928bd38d6c41532b (diff) | |
Merge pull request #46264 from nmrkr/build-planes-axes-check
Fix unchecked array access in build_*_planes
Diffstat (limited to 'core')
| -rw-r--r-- | core/math/geometry_3d.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/math/geometry_3d.cpp b/core/math/geometry_3d.cpp index a4a7463bfd..6628b760e0 100644 --- a/core/math/geometry_3d.cpp +++ b/core/math/geometry_3d.cpp @@ -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; |