2020-11-03 07:00:00 +11:00
|
|
|
From 2d3f66d7a7f96661115814906cd8afe980db232b Mon Sep 17 00:00:00 2001
|
2019-12-11 09:00:00 +11: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
|
2020-06-25 10:00:00 +10:00
|
|
|
index de8bd9b3c..d7ba2db63 100644
|
2019-12-11 09:00:00 +11:00
|
|
|
--- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
|
|
|
|
@@ -14,6 +14,7 @@ public class NBTTagByteArray extends NBTList<NBTTagByte> {
|
|
|
|
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/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
|
2020-06-25 10:00:00 +10:00
|
|
|
index 98f589514..eb3fc6db6 100644
|
2019-12-11 09:00:00 +11:00
|
|
|
--- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
|
|
|
|
@@ -14,6 +14,7 @@ public class NBTTagIntArray extends NBTList<NBTTagInt> {
|
|
|
|
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];
|
|
|
|
--
|
2020-05-09 18:48:11 +10:00
|
|
|
2.25.1
|
2019-12-11 09:00:00 +11:00
|
|
|
|