PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Ensure the copy is freed if an exception occurs during parsing packets

Browse Source
This commit is contained in:
Thinkofdeath 2015-04-12 01:43:24 +01:00
parent a48c458306
commit d76c8d4f33
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
View File

@ -23,22 +23,32 @@ public class MinecraftDecoder extends ByteToMessageDecoder
Protocol.DirectionData prot = ( server ) ? protocol.TO_SERVER : protocol.TO_CLIENT; Protocol.DirectionData prot = ( server ) ? protocol.TO_SERVER : protocol.TO_CLIENT;
ByteBuf copy = in.copy(); // TODO ByteBuf copy = in.copy(); // TODO
int packetId = DefinedPacket.readVarInt( in ); try
DefinedPacket packet = null;
if ( prot.hasPacket( packetId ) )
{ {
packet = prot.createPacket( packetId ); int packetId = DefinedPacket.readVarInt( in );
packet.read( in, prot.getDirection(), protocolVersion );
if ( in.readableBytes() != 0 ) DefinedPacket packet = null;
if ( prot.hasPacket( packetId ) )
{ {
throw new BadPacketException( "Did not read all bytes from packet " + packet.getClass() + " " + packetId + " Protocol " + protocol + " Direction " + prot ); packet = prot.createPacket( packetId );
packet.read( in, prot.getDirection(), protocolVersion );
if ( in.readableBytes() != 0 )
{
throw new BadPacketException( "Did not read all bytes from packet " + packet.getClass() + " " + packetId + " Protocol " + protocol + " Direction " + prot );
}
} else
{
in.skipBytes( in.readableBytes() );
} }
} else
{
in.skipBytes( in.readableBytes() );
}
out.add( new PacketWrapper( packet, copy ) ); out.add( new PacketWrapper( packet, copy ) );
copy = null;
} finally
{
if ( copy != null )
{
copy.release();
}
}
} }
} }