2014-08-31 20:56:05 +02:00
|
|
|
From 589841bcd0393917f91f7f3754aa21f02d624ee2 Mon Sep 17 00:00:00 2001
|
2014-07-21 22:46:54 +02:00
|
|
|
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
|
|
|
|
|
index 3eeed3e..78a1b9a 100644
|
|
|
|
|
--- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
|
|
|
|
|
@@ -22,6 +22,7 @@ public class NBTTagByteArray extends NBTBase {
|
|
|
|
|
|
|
|
|
|
void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException {
|
|
|
|
|
int j = datainput.readInt();
|
|
|
|
|
+ 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
|
|
|
|
|
index c7cea7f..099e16a 100644
|
|
|
|
|
--- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
|
|
|
|
|
@@ -25,6 +25,7 @@ public class NBTTagIntArray extends NBTBase {
|
|
|
|
|
|
|
|
|
|
void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException {
|
|
|
|
|
int j = datainput.readInt();
|
|
|
|
|
+ com.google.common.base.Preconditions.checkArgument( j < 1 << 24);
|
|
|
|
|
|
|
|
|
|
nbtreadlimiter.a((long) (32 * j));
|
|
|
|
|
this.data = new int[j];
|
|
|
|
|
--
|
|
|
|
|
1.9.1
|
|
|
|
|
|
