From 4352bfaaefb47e1cf582c6176d7479acf99452ab Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 20 Jan 2014 13:44:07 +1100 Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays. diff --git a/src/main/java/net/minecraft/nbt/NBTTagByteArray.java b/src/main/java/net/minecraft/nbt/NBTTagByteArray.java index 47ee94798..2172a1908 100644 --- a/src/main/java/net/minecraft/nbt/NBTTagByteArray.java +++ b/src/main/java/net/minecraft/nbt/NBTTagByteArray.java @@ -16,6 +16,7 @@ public class NBTTagByteArray extends NBTList { public NBTTagByteArray b(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException { nbtreadlimiter.a(192L); int j = datainput.readInt(); + com.google.common.base.Preconditions.checkArgument( j < 1 << 24); // Spigot nbtreadlimiter.a(8L * (long) j); byte[] abyte = new byte[j]; diff --git a/src/main/java/net/minecraft/nbt/NBTTagIntArray.java b/src/main/java/net/minecraft/nbt/NBTTagIntArray.java index 1394a877c..b82c3b1ff 100644 --- a/src/main/java/net/minecraft/nbt/NBTTagIntArray.java +++ b/src/main/java/net/minecraft/nbt/NBTTagIntArray.java @@ -16,6 +16,7 @@ public class NBTTagIntArray extends NBTList { public NBTTagIntArray b(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException { nbtreadlimiter.a(192L); int j = datainput.readInt(); + com.google.common.base.Preconditions.checkArgument( j < 1 << 24); // Spigot nbtreadlimiter.a(32L * (long) j); int[] aint = new int[j]; -- 2.25.1