Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2025-01-05 20:21:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add additional checks to FlexibleStorage and Chunk

Browse source
This commit is contained in:
RednedEpic 2020-05-21 18:39:52 -05:00
parent c62ed6a6d9
commit 81de9b4577
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/Chunk.java
View file

@ -35,7 +35,7 @@ public class Chunk {
int bitsPerEntry = in.readUnsignedByte(); int bitsPerEntry = in.readUnsignedByte();
List<BlockState> states = new ArrayList<>(); List<BlockState> states = new ArrayList<>();
int stateCount = bitsPerEntry > 8 ? 0 : in.readVarInt(); int stateCount = (bitsPerEntry > 8 || bitsPerEntry == 0) ? 0 : in.readVarInt();
for(int i = 0; i < stateCount; i++) { for(int i = 0; i < stateCount; i++) {
states.add(BlockState.read(in)); states.add(BlockState.read(in));
} }

7
src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/FlexibleStorage.java
View file

@ -21,6 +21,13 @@ public class FlexibleStorage {
bitsPerEntry = 4; bitsPerEntry = 4;
} }
char valuesPerLong = (char) (64 / bitsPerEntry);
int expectedLength = (4096 + valuesPerLong - 1) / valuesPerLong;
if (data.length != expectedLength) {
throw new IllegalArgumentException("Got " + data.length + " as the chunk data length, but was expecting " + expectedLength);
}
this.bitsPerEntry = bitsPerEntry; this.bitsPerEntry = bitsPerEntry;
this.data = Arrays.copyOf(data, data.length); this.data = Arrays.copyOf(data, data.length);