From 72498a3ceda63f17dd33c7037ddde732f63b0733 Mon Sep 17 00:00:00 2001 From: tdetoy Date: Mon, 18 Apr 2022 01:47:16 -0400 Subject: [PATCH] mesh_surface_get_format_offset and mesh_surface_get_format_stride will now provide an error with an invalid array index (cherry picked from commit 8e57aae57dd997959d17178ed452350cd4bf03bf) --- servers/visual_server.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index 9d2053872f1..040c441137e 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -843,6 +843,7 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_ } uint32_t VisualServer::mesh_surface_get_format_offset(uint32_t p_format, int p_vertex_len, int p_index_len, int p_array_index) const { + ERR_FAIL_INDEX_V(p_array_index, ARRAY_MAX, 0); uint32_t offsets[ARRAY_MAX]; uint32_t strides[ARRAY_MAX]; mesh_surface_make_offsets_from_format(p_format, p_vertex_len, p_index_len, offsets, strides); @@ -850,6 +851,7 @@ uint32_t VisualServer::mesh_surface_get_format_offset(uint32_t p_format, int p_v } uint32_t VisualServer::mesh_surface_get_format_stride(uint32_t p_format, int p_vertex_len, int p_index_len, int p_array_index) const { + ERR_FAIL_INDEX_V(p_array_index, ARRAY_MAX, 0); uint32_t offsets[ARRAY_MAX]; uint32_t strides[ARRAY_MAX]; mesh_surface_make_offsets_from_format(p_format, p_vertex_len, p_index_len, offsets, strides);