asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix memory access error for MultiMesh with GLES3

Browse source 
Buffer was incorrectly assigned when invalid data was provided
This commit is contained in:
A Thousand Ships 2023-08-19 16:01:21 +02:00
parent 5444afae63
commit 6cb28e481f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gles3/storage/mesh_storage.cpp
View file

@ -1689,14 +1689,16 @@ void MeshStorage::multimesh_set_buffer(RID p_multimesh, const Vector<float> &p_b
// Color and custom need to be packed so copy buffer to data_cache and pack.
_multimesh_make_local(multimesh);
multimesh->data_cache = p_buffer;
float *w = multimesh->data_cache.ptrw();
uint32_t old_stride = multimesh->xform_format == RS::MULTIMESH_TRANSFORM_2D ? 8 : 12;
old_stride += multimesh->uses_colors ? 4 : 0;
old_stride += multimesh->uses_custom_data ? 4 : 0;
ERR_FAIL_COND(p_buffer.size() != (multimesh->instances * (int)old_stride));
multimesh->data_cache = p_buffer;
float *w = multimesh->data_cache.ptrw();
for (int i = 0; i < multimesh->instances; i++) {
{
float *dataptr = w + i * old_stride;