Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2025-02-07 23:41:19 +01:00
Code Issues Projects Releases Wiki Activity

Preallocate compression output buffer to remove unnecessary resizing

Browse Source
This commit is contained in:
md_5 2025-01-27 20:08:58 +11:00
parent 0aa2871b26
commit 60a3bf082f
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/src/main/java/net/md_5/bungee/jni/zlib/NativeZlib.java
View File

@ -52,7 +52,13 @@ public class NativeZlib implements BungeeZlib
while ( !nativeCompress.finished && ( compress || in.isReadable() ) ) while ( !nativeCompress.finished && ( compress || in.isReadable() ) )
{ {
out.ensureWritable( OUTPUT_BUFFER_SIZE ); if ( compress )
{
out.ensureWritable( OUTPUT_BUFFER_SIZE );
} else
{
Preconditions.checkArgument( out.isWritable(), "Output buffer overrun" );
}
int processed; int processed;
try try

2
native/src/test/java/net/md_5/bungee/NativeZlibTest.java
View File

@ -64,7 +64,7 @@ public class NativeZlibTest
zlib.process( originalBuf, compressed ); zlib.process( originalBuf, compressed );
ByteBuf uncompressed = Unpooled.directBuffer(); ByteBuf uncompressed = Unpooled.directBuffer( dataBuf.length, dataBuf.length );
zlib.init( false, 0 ); zlib.init( false, 0 );
zlib.process( compressed, uncompressed ); zlib.process( compressed, uncompressed );

8
proxy/src/main/java/net/md_5/bungee/compress/PacketDecompressor.java
View File

@ -7,10 +7,12 @@ import io.netty.handler.codec.MessageToMessageDecoder;
import java.util.List; import java.util.List;
import net.md_5.bungee.jni.zlib.BungeeZlib; import net.md_5.bungee.jni.zlib.BungeeZlib;
import net.md_5.bungee.protocol.DefinedPacket; import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.OverflowPacketException;
public class PacketDecompressor extends MessageToMessageDecoder<ByteBuf> public class PacketDecompressor extends MessageToMessageDecoder<ByteBuf>
{ {
private static final int MAX_DECOMPRESSED_LEN = 1 << 23;
private final BungeeZlib zlib = CompressFactory.zlib.newInstance(); private final BungeeZlib zlib = CompressFactory.zlib.newInstance();
@Override @Override
@ -34,8 +36,12 @@ public class PacketDecompressor extends MessageToMessageDecoder<ByteBuf>
out.add( in.retain() ); out.add( in.retain() );
} else } else
{ {
ByteBuf decompressed = ctx.alloc().directBuffer(); if ( size > MAX_DECOMPRESSED_LEN )
{
throw new OverflowPacketException( "Packet may not be larger than " + MAX_DECOMPRESSED_LEN + " bytes" );
}
ByteBuf decompressed = ctx.alloc().directBuffer( size, size );
try try
{ {
zlib.process( in, decompressed ); zlib.process( in, decompressed );