UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check not null before accessing by index (#2243)

Browse source
This commit is contained in:
Antonis Geralis 2021-12-24 21:54:25 +03:00 • committed by GitHub
parent f66ae2366f
commit dcc0791502
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/rmodels.c
View file

@ -1624,7 +1624,7 @@ void UnloadMesh(Mesh mesh)
// Unload rlgl mesh vboId data // Unload rlgl mesh vboId data
rlUnloadVertexArray(mesh.vaoId); rlUnloadVertexArray(mesh.vaoId);
for (int i = 0; i < MAX_MESH_VERTEX_BUFFERS; i++) rlUnloadVertexBuffer(mesh.vboId[i]); if (mesh.vboId != NULL) for (int i = 0; i < MAX_MESH_VERTEX_BUFFERS; i++) rlUnloadVertexBuffer(mesh.vboId[i]);
RL_FREE(mesh.vboId); RL_FREE(mesh.vboId);
RL_FREE(mesh.vertices); RL_FREE(mesh.vertices);
@ -1787,10 +1787,13 @@ void UnloadMaterial(Material material)
if (material.shader.id != rlGetShaderIdDefault()) UnloadShader(material.shader); if (material.shader.id != rlGetShaderIdDefault()) UnloadShader(material.shader);
// Unload loaded texture maps (avoid unloading default texture, managed by raylib) // Unload loaded texture maps (avoid unloading default texture, managed by raylib)
if (material.maps != NULL)
{
for (int i = 0; i < MAX_MATERIAL_MAPS; i++) for (int i = 0; i < MAX_MATERIAL_MAPS; i++)
{ {
if (material.maps[i].texture.id != rlGetTextureIdDefault()) rlUnloadTexture(material.maps[i].texture.id); if (material.maps[i].texture.id != rlGetTextureIdDefault()) rlUnloadTexture(material.maps[i].texture.id);
} }
}
RL_FREE(material.maps); RL_FREE(material.maps);
} }