34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
|
From 51cc9fc818ece90ca3349895c2d8d7d7f210b99e 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
|
||
|
|
index 916d935..3fa9c1a 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) throws IOException {
|
||
|
|
int j = datainput.readInt();
|
||
|
|
+ com.google.common.base.Preconditions.checkArgument( i < 1 << 24);
|
||
|
|
|
||
|
|
this.data = new byte[j];
|
||
|
|
datainput.readFully(this.data);
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
|
||
|
|
index 49b3f14..6c33462 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) throws IOException {
|
||
|
|
int j = datainput.readInt();
|
||
|
|
+ com.google.common.base.Preconditions.checkArgument( i < 1 << 24);
|
||
|
|
|
||
|
|
this.data = new int[j];
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.3.2
|
||
|
|
|