Paper/CraftBukkit-Patches/0136-Apply-NBTReadLimiter-to-more-things.patch

72 lines
2.1 KiB
Diff
Raw Normal View History

2015-06-01 11:22:52 +02:00
From 861f27394c887f77a7bd70a9bacc57465bbb797b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 27 Jul 2014 20:46:04 +1000
Subject: [PATCH] Apply NBTReadLimiter to more things.
diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
2015-02-28 12:36:22 +01:00
index 2a04b86..b2d5254 100644
--- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
+++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
2015-02-28 12:36:22 +01:00
@@ -44,6 +44,12 @@ public class NBTCompressedStreamTools {
}
2015-02-28 12:36:22 +01:00
public static NBTTagCompound a(DataInput datainput, NBTReadLimiter nbtreadlimiter) throws IOException {
2014-11-28 02:17:45 +01:00
+ // Spigot start
+ if ( datainput instanceof io.netty.buffer.ByteBufInputStream )
+ {
+ datainput = new DataInputStream(new org.spigotmc.LimitStream((InputStream) datainput, nbtreadlimiter));
+ }
+ // Spigot end
NBTBase nbtbase = a(datainput, 0, nbtreadlimiter);
2014-11-28 02:17:45 +01:00
if (nbtbase instanceof NBTTagCompound) {
diff --git a/src/main/java/org/spigotmc/LimitStream.java b/src/main/java/org/spigotmc/LimitStream.java
new file mode 100644
2015-04-16 18:38:35 +02:00
index 0000000..8c32e8b
--- /dev/null
+++ b/src/main/java/org/spigotmc/LimitStream.java
@@ -0,0 +1,39 @@
+package org.spigotmc;
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import net.minecraft.server.NBTReadLimiter;
+
+public class LimitStream extends FilterInputStream
+{
+
+ private final NBTReadLimiter limit;
+
+ public LimitStream(InputStream is, NBTReadLimiter limit)
+ {
+ super( is );
+ this.limit = limit;
+ }
+
+ @Override
+ public int read() throws IOException
+ {
2015-04-16 18:38:35 +02:00
+ limit.a( 8 );
+ return super.read();
+ }
+
+ @Override
+ public int read(byte[] b) throws IOException
+ {
2015-04-16 18:38:35 +02:00
+ limit.a( b.length * 8 );
+ return super.read( b );
+ }
+
+ @Override
+ public int read(byte[] b, int off, int len) throws IOException
+ {
2015-04-16 18:38:35 +02:00
+ limit.a( len * 8 );
+ return super.read( b, off, len );
+ }
+}
--
2015-05-09 22:23:26 +02:00
2.1.4