geforkt von Mirrors/Paper
72 Zeilen
2.1 KiB
Diff
72 Zeilen
2.1 KiB
Diff
From 828f70cff22e47607ef0d152f4f6c46bbc71230c 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
|
|
index 2a04b86..b2d5254 100644
|
|
--- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
|
|
+++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
|
|
@@ -44,6 +44,12 @@ public class NBTCompressedStreamTools {
|
|
}
|
|
|
|
public static NBTTagCompound a(DataInput datainput, NBTReadLimiter nbtreadlimiter) throws IOException {
|
|
+ // 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);
|
|
|
|
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
|
|
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
|
|
+ {
|
|
+ limit.a( 8 );
|
|
+ return super.read();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int read(byte[] b) throws IOException
|
|
+ {
|
|
+ limit.a( b.length * 8 );
|
|
+ return super.read( b );
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int read(byte[] b, int off, int len) throws IOException
|
|
+ {
|
|
+ limit.a( len * 8 );
|
|
+ return super.read( b, off, len );
|
|
+ }
|
|
+}
|
|
--
|
|
2.1.4
|
|
|