PaperMC/CraftBukkit-Patches/0063-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch

34 lines
1.5 KiB
Diff
Raw Normal View History

2016-03-01 01:23:45 +01:00
From 9ac4a3b1609dd19bb6f8b14f37172207bf9ec6c0 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-05-09 22:23:26 +02:00
index c6b5f70..13e9d0b 100644
--- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
+++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
2015-05-09 22:23:26 +02:00
@@ -23,6 +23,7 @@ public class NBTTagByteArray extends NBTBase {
2015-02-28 12:36:22 +01:00
void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException {
2015-05-09 22:23:26 +02:00
nbtreadlimiter.a(192L);
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-05-09 22:23:26 +02:00
index 5f17034..e206e50 100644
--- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
+++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
2015-05-09 22:23:26 +02:00
@@ -27,6 +27,7 @@ public class NBTTagIntArray extends NBTBase {
2015-02-28 12:36:22 +01:00
void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException {
2015-05-09 22:23:26 +02:00
nbtreadlimiter.a(192L);
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];
--
2016-02-29 22:33:06 +01:00
2.5.0