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

34 lines
1.4 KiB
Diff
Raw Normal View History

2014-06-22 11:25:10 +02:00
From 65c8be01221ff4eb29dd4d8f076b5972d45895aa Mon Sep 17 00:00:00 2001
2014-04-12 06:18:37 +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
2014-04-12 06:18:37 +02:00
--- 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 {
2014-04-12 06:18:37 +02:00
int j = datainput.readInt();
+ com.google.common.base.Preconditions.checkArgument( j < 1 << 24);
nbtreadlimiter.a((long) (8 * j));
2014-04-12 06:18:37 +02: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
index c7cea7f..099e16a 100644
2014-04-12 06:18:37 +02:00
--- 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 {
2014-04-12 06:18:37 +02:00
int j = datainput.readInt();
+ com.google.common.base.Preconditions.checkArgument( j < 1 << 24);
nbtreadlimiter.a((long) (32 * j));
2014-04-12 06:18:37 +02:00
this.data = new int[j];
--
2014-04-19 01:15:23 +02:00
1.9.1
2014-04-12 06:18:37 +02:00