From 9b21a2d835735b3dcafbdb4d89c8b0e66cd03cfd Mon Sep 17 00:00:00 2001 From: Techcable Date: Tue, 3 May 2016 20:31:52 -0700 Subject: [PATCH] Don't access a ByteBuf's underlying array It returns the underlying array storage, and does *not* return a view of the buffer as an array diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java index c01cf317..17e12655 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java @@ -4,6 +4,7 @@ import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufUtil; // Waterfall import java.io.ByteArrayInputStream; import java.io.DataInput; import java.io.DataInputStream; @@ -56,10 +57,23 @@ public class PluginMessage extends DefinedPacket return ( input.getTag().equals( "REGISTER" ) || input.getTag().equals( "minecraft:register" ) || input.getTag().equals( "MC|Brand" ) || input.getTag().equals( "minecraft:brand" ) ) && input.getData().length < Byte.MAX_VALUE; } }; - // + + public PluginMessage(String tag, ByteBuf data, boolean allowExtendedPacket) { + this(tag, ByteBufUtil.getBytes(data), allowExtendedPacket); + } + private String tag; private byte[] data; + public void setData(byte[] data) { + this.data = Preconditions.checkNotNull(data, "Null data"); + } + + public void setData(ByteBuf buf) { + Preconditions.checkNotNull(buf, "Null buffer"); + setData(ByteBufUtil.getBytes(buf)); + } + /** * Allow this packet to be sent as an "extended" packet. */ diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java index 552af4fc..91b8b41a 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -217,7 +217,7 @@ public class ServerConnector extends PacketHandler ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer(); DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand ); - user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", DefinedPacket.toArray( brand ), handshakeHandler.isServerForge() ) ); + user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", brand, handshakeHandler.isServerForge() ) ); brand.release(); user.setDimension( login.getDimension() ); diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java index 63162de0..db39f52d 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java @@ -256,7 +256,7 @@ public class DownstreamBridge extends PacketHandler brand = ByteBufAllocator.DEFAULT.heapBuffer(); DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand ); - pluginMessage.setData( DefinedPacket.toArray( brand ) ); + pluginMessage.setData( brand ); brand.release(); // changes in the packet are ignored so we need to send it manually con.unsafe().sendPacket( pluginMessage ); diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java index f75ec97d..bc7a6d80 100644 --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java @@ -43,9 +43,9 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender; public class PipelineUtils { - public static final AttributeKey LISTENER = AttributeKey.valueOf( "ListerInfo" ); - public static final AttributeKey USER = AttributeKey.valueOf( "User" ); - public static final AttributeKey TARGET = AttributeKey.valueOf( "Target" ); + public static final AttributeKey LISTENER = AttributeKey.newInstance("ListerInfo"); + public static final AttributeKey USER = AttributeKey.newInstance("User"); + public static final AttributeKey TARGET = AttributeKey.newInstance("Target"); public static final ChannelInitializer SERVER_CHILD = new ChannelInitializer() { @Override -- 2.21.0