Skip to content

Fix integer overflow in StationTessellatorImpl buffer growth #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matthewperiut wants to merge 1 commit into
base: develop
Choose a base branch
from
+19 −5
Open

Fix integer overflow in StationTessellatorImpl buffer growth #262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions ...in/java/net/modificationstation/stationapi/impl/client/render/StationTessellatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@

public class StationTessellatorImpl implements StationTessellator {

// Hard ceiling on the int-buffer size so it can never grow large enough for
// bufferSize * 4 (the byte-buffer allocation) to overflow a signed int.
// 2^28 ints = 1 GiB direct buffer, far beyond anything vanilla rendering needs;
// the buffer base size is 2^21 ints, so this still allows several doublings.
private static final int MAX_BUFFER_SIZE = 1 << 28;

private final Tessellator self;
private final TessellatorAccessor access;
private final int[] fastVertexData = new int[32];
Expand Down Expand Up @@ -103,11 +109,19 @@ public void quad(BakedQuad quad, float x, float y, float z, int colour0, int col

@Override
public void ensureBufferCapacity(int criticalCapacity) {
if (access.stationapi$getBufferPosition() >= access.stationapi$getBufferSize() - criticalCapacity) {
LOGGER.info("Tessellator is nearing its maximum capacity. Increasing the buffer size from {} to {}", access.stationapi$getBufferSize(), access.stationapi$getBufferSize() * 2);
access.stationapi$setBufferSize(access.stationapi$getBufferSize() * 2);
access.stationapi$setBuffer(Arrays.copyOf(access.stationapi$getBuffer(), access.stationapi$getBufferSize()));
ByteBuffer newBuffer = GlAllocationUtils.allocateByteBuffer(access.stationapi$getBufferSize() * 4);
int bufferSize = access.stationapi$getBufferSize();
if (access.stationapi$getBufferPosition() >= bufferSize - criticalCapacity) {
if (bufferSize >= MAX_BUFFER_SIZE) {
// Already at the ceiling; doubling further would overflow bufferSize * 4.
// Leave the buffer as-is rather than allocating an invalid (negative) capacity.
return;
}
int newBufferSize = Math.min(bufferSize * 2, MAX_BUFFER_SIZE);
LOGGER.info("Tessellator is nearing its maximum capacity. Increasing the buffer size from {} to {}", bufferSize, newBufferSize);
access.stationapi$setBufferSize(newBufferSize);
access.stationapi$setBuffer(Arrays.copyOf(access.stationapi$getBuffer(), newBufferSize));
// long arithmetic so the byte count can never overflow a signed int.
ByteBuffer newBuffer = GlAllocationUtils.allocateByteBuffer((int) ((long) newBufferSize * 4));
access.stationapi$setByteBuffer(newBuffer);
access.stationapi$setIntBuffer(newBuffer.asIntBuffer());
access.stationapi$setFloatBuffer(newBuffer.asFloatBuffer());
Expand Down