2018-07-22 12:00:00 +10:00
|
|
|
From 752a672aa6dab38a080f4de2c722ba0ef3b5b36a Mon Sep 17 00:00:00 2001
|
2014-04-12 14:18:37 +10: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
|
2018-07-22 12:00:00 +10:00
|
|
|
index 6f8d3748b..11ffa6c34 100644
|
2014-04-12 14:18:37 +10:00
|
|
|
--- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
|
2018-07-15 10:00:00 +10:00
|
|
|
@@ -41,6 +41,7 @@ public class NBTTagByteArray extends NBTList<NBTTagByte> {
|
|
|
|
public void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException {
|
2015-05-09 21:23:26 +01:00
|
|
|
nbtreadlimiter.a(192L);
|
2014-04-12 14:18:37 +10:00
|
|
|
int j = datainput.readInt();
|
2018-07-15 10:00:00 +10:00
|
|
|
+ com.google.common.base.Preconditions.checkArgument( j < 1 << 24);
|
2014-04-12 14:18:37 +10:00
|
|
|
|
2014-04-12 14:49:42 +10:00
|
|
|
nbtreadlimiter.a((long) (8 * j));
|
2014-04-12 14:18:37 +10:00
|
|
|
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
|
2018-07-22 12:00:00 +10:00
|
|
|
index 1022c00be..f5c9b97d5 100644
|
2014-04-12 14:18:37 +10:00
|
|
|
--- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
|
2018-07-15 10:00:00 +10:00
|
|
|
@@ -49,6 +49,7 @@ public class NBTTagIntArray extends NBTList<NBTTagInt> {
|
|
|
|
public void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException {
|
2015-05-09 21:23:26 +01:00
|
|
|
nbtreadlimiter.a(192L);
|
2014-04-12 14:18:37 +10:00
|
|
|
int j = datainput.readInt();
|
2018-07-15 10:00:00 +10:00
|
|
|
+ com.google.common.base.Preconditions.checkArgument( j < 1 << 24);
|
2014-04-12 14:18:37 +10:00
|
|
|
|
2014-04-12 14:49:42 +10:00
|
|
|
nbtreadlimiter.a((long) (32 * j));
|
2014-04-12 14:18:37 +10:00
|
|
|
this.data = new int[j];
|
|
|
|
--
|
2018-07-15 10:00:00 +10:00
|
|
|
2.17.1
|
2014-04-12 14:18:37 +10:00
|
|
|
|