Paper/CraftBukkit-Patches/0072-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch

34 lines
1.4 KiB
Diff
Raw Normal View History

2015-03-08 12:04:41 +01:00
From ec1f9295415c99a03bde0e1d5d41221d2d8ab6db Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
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/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java
2015-02-28 12:36:22 +01:00
index 3eeed3e..4e9b714 100644
--- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
+++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
2015-02-28 12:36:22 +01:00
@@ -22,6 +22,7 @@ public class NBTTagByteArray extends NBTBase {
2015-02-28 12:36:22 +01:00
void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException {
int j = datainput.readInt();
2014-11-28 02:17:45 +01:00
+ com.google.common.base.Preconditions.checkArgument( j < 1 << 24);
nbtreadlimiter.a((long) (8 * j));
this.data = new byte[j];
diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
2015-02-28 12:36:22 +01:00
index 63c3bf9..1ff0902 100644
--- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
+++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
2015-02-28 12:36:22 +01:00
@@ -26,6 +26,7 @@ public class NBTTagIntArray extends NBTBase {
2015-02-28 12:36:22 +01:00
void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException {
int j = datainput.readInt();
2014-11-28 02:17:45 +01:00
+ com.google.common.base.Preconditions.checkArgument( j < 1 << 24);
nbtreadlimiter.a((long) (32 * j));
this.data = new int[j];
--
2014-11-28 02:17:45 +01:00
2.1.0