voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-11 14:01:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix unchecked indices buffer overflow

Browse source
This commit is contained in:
MihailRis 2026-01-08 20:06:23 +03:00
parent 8fc83c08e2
commit 336ae09f66
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/graphics/render/BlocksRenderer.cpp
View file

@ -80,7 +80,7 @@ void BlocksRenderer::face(
const glm::vec4(&lights)[4], const glm::vec4(&lights)[4],
const glm::vec4& tint const glm::vec4& tint
) { ) {
if (vertexCount + 4 >= capacity) { if (vertexCount + 4 >= capacity || indexCount + 6 >= capacity) {
overflow = true; overflow = true;
return; return;
} }
@ -120,7 +120,7 @@ void BlocksRenderer::faceAO(
const UVRegion& region, const UVRegion& region,
bool lights bool lights
) { ) {
if (vertexCount + 4 >= capacity) { if (vertexCount + 4 >= capacity || indexCount + 6 >= capacity) {
overflow = true; overflow = true;
return; return;
} }
@ -159,7 +159,7 @@ void BlocksRenderer::face(
glm::vec4 tint, glm::vec4 tint,
bool lights bool lights
) { ) {
if (vertexCount + 4 >= capacity) { if (vertexCount + 4 >= capacity || indexCount + 6 >= capacity) {
overflow = true; overflow = true;
return; return;
} }
@ -305,12 +305,15 @@ void BlocksRenderer::blockCustomModel(
const auto& model = cache.getModel(block.rt.id, block.getVariantIndex(states.userbits)); const auto& model = cache.getModel(block.rt.id, block.getVariantIndex(states.userbits));
for (const auto& mesh : model.meshes) { for (const auto& mesh : model.meshes) {
if (vertexCount + mesh.vertices.size() >= capacity) { if (vertexCount + mesh.vertices.size() >= capacity
|| indexCount + mesh.vertices.size() >= capacity) {
overflow = true; overflow = true;
return; return;
} }
bool shading = mesh.shading && !block.shadeless; bool shading = mesh.shading && !block.shadeless;
for (int triangle = 0; triangle < mesh.vertices.size() / 3; triangle++) {
int trianglesCount = mesh.vertices.size() / 3;
for (int triangle = 0; triangle < trianglesCount; triangle++) {
auto r = mesh.vertices[triangle * 3 + (triangle % 2) * 2].coord - auto r = mesh.vertices[triangle * 3 + (triangle % 2) * 2].coord -
mesh.vertices[triangle * 3 + 1].coord; mesh.vertices[triangle * 3 + 1].coord;
r = r.x * X + r.y * Y + r.z * Z; r = r.x * X + r.y * Y + r.z * Z;
@ -778,6 +781,10 @@ ChunkMesh BlocksRenderer::render(
const Chunk* chunk, const VoxelsVolume& volume const Chunk* chunk, const VoxelsVolume& volume
) { ) {
build(chunk, volume); build(chunk, volume);
assert(vertexCount <= capacity);
assert(indexCount <= capacity);
assert(denseIndexCount <= capacity);
return ChunkMesh{std::make_unique<Mesh<ChunkVertex>>( return ChunkMesh{std::make_unique<Mesh<ChunkVertex>>(
vertexBuffer.get(), vertexCount, vertexBuffer.get(), vertexCount,