mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-12 09:51:12 +01:00
19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
From 376a98c626d952be1ec7c4b0243c54a4f205fb23 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 7525469..7a293eb 100644
|
|
--- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
|
|
+++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
|
|
@@ -21,6 +21,7 @@ public class NBTTagByteArray extends NBTBase {
|
|
|
|
void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws java.io.IOException {
|
|
int j = datainput.readInt();
|
|
+ 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
|
|
index f331ef3..17b0c3d 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, NBTReadLimiter nbtreadlimiter) throws java.io.IOException {
|
|
int j = datainput.readInt();
|
|
+ com.google.common.base.Preconditions.checkArgument( j < 1 << 24);
|
|
|
|
nbtreadlimiter.a((long) (32 * j));
|
|
this.data = new int[j];
|
|
--
|
|
2.1.0
|
|
|