Skip to content

Commit 86bf835

Browse files
committed
Merge pull request #91198 from jsjtxietian/SurfaceTool
Fix `SurfaceTool.create_from_arrays` crash with bad index
2 parents f55b81b + 01135bc commit 86bf835

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

scene/resources/surface_tool.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,8 @@ const uint32_t SurfaceTool::custom_mask[RS::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_
803803
const uint32_t SurfaceTool::custom_shift[RS::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_FORMAT_CUSTOM0_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM1_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM2_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM3_SHIFT };
804804

805805
void SurfaceTool::create_vertex_array_from_arrays(const Array &p_arrays, LocalVector<SurfaceTool::Vertex> &ret, uint64_t *r_format) {
806+
ERR_FAIL_INDEX(RS::ARRAY_WEIGHTS, p_arrays.size());
807+
806808
ret.clear();
807809

808810
Vector<Vector3> varr = p_arrays[RS::ARRAY_VERTEX];

0 commit comments

Comments
 (0)