Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-19 10:21:18 +02:00
Code Issues Projects Releases Wiki Activity

Validate chunk data array lengths. Fixes BUKKIT-4093

Browse Source 
If a chunk has somehow managed to save with arrays that are not 4096
entries long when reading them again we will get exceptions. Checking the
array length and resizing if needed is cheap so we should do this to help
avoid crashing servers due to this error.
This commit is contained in:
Mike Primm 2013-04-15 15:51:18 -05:00 committed by Travis Watkins
parent 928e4d9bbb
commit 40e6308718
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/net/minecraft/server/ChunkSection.java
View File

@ -219,7 +219,7 @@ public class ChunkSection {
}
public void a(byte[] abyte) {
this.blockIds = abyte;
this.blockIds = this.validateByteArray(abyte); // CraftBukkit - Validate data
}
public void a(NibbleArray nibblearray) {
@ -237,18 +237,40 @@ public class ChunkSection {
}
// CraftBukkit end
this.extBlockIds = nibblearray;
this.extBlockIds = this.validateNibbleArray(nibblearray); // CraftBukkit - Validate data
}
public void b(NibbleArray nibblearray) {
this.blockData = nibblearray;
this.blockData = this.validateNibbleArray(nibblearray); // CraftBukkit - Validate data
}
public void c(NibbleArray nibblearray) {
this.blockLight = nibblearray;
this.blockLight = this.validateNibbleArray(nibblearray); // CraftBukkit - Validate data
}
public void d(NibbleArray nibblearray) {
this.skyLight = nibblearray;
this.skyLight = this.validateNibbleArray(nibblearray); // CraftBukkit - Validate data
}
// CraftBukkit start - Validate array lengths
private NibbleArray validateNibbleArray(NibbleArray nibbleArray) {
if (nibbleArray != null && nibbleArray.a.length < 2048) {
byte[] newArray = new byte[2048];
System.arraycopy(nibbleArray.a, 0, newArray, 0, ((nibbleArray.a.length > 2048) ? 2048 : nibbleArray.a.length));
nibbleArray = new NibbleArray(newArray, 4);
}
return nibbleArray;
}
private byte[] validateByteArray(byte[] byteArray) {
if (byteArray != null && byteArray.length < 4096) {
byte[] newArray = new byte[4096];
System.arraycopy(byteArray, 0, newArray, 0, byteArray.length);
byteArray = newArray;
}
return byteArray;
}
// CraftBukkit end
}