PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Add some failsafe length preconditions

Browse Source
This commit is contained in:
md_5 2013-12-02 18:49:39 +11:00
parent aad83d787f
commit 63d49ac296
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
View File

@ -1,6 +1,7 @@
package net.md_5.bungee.protocol; package net.md_5.bungee.protocol;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -10,7 +11,8 @@ public abstract class DefinedPacket
public static void writeString(String s, ByteBuf buf) public static void writeString(String s, ByteBuf buf)
{ {
// TODO: Check len - use Guava? Preconditions.checkArgument( s.length() <= Short.MAX_VALUE, "Cannot send string longer than Short.MAX_VALUE (got %s characters)", s.length() );
byte[] b = s.getBytes( Charsets.UTF_8 ); byte[] b = s.getBytes( Charsets.UTF_8 );
writeVarInt( b.length, buf ); writeVarInt( b.length, buf );
buf.writeBytes( b ); buf.writeBytes( b );
@ -19,6 +21,8 @@ public abstract class DefinedPacket
public static String readString(ByteBuf buf) public static String readString(ByteBuf buf)
{ {
int len = readVarInt( buf ); int len = readVarInt( buf );
Preconditions.checkArgument( len <= Short.MAX_VALUE, "Cannot receive string longer than Short.MAX_VALUE (got %s characters)", len );
byte[] b = new byte[ len ]; byte[] b = new byte[ len ];
buf.readBytes( b ); buf.readBytes( b );
@ -27,15 +31,17 @@ public abstract class DefinedPacket
public static void writeArray(byte[] b, ByteBuf buf) public static void writeArray(byte[] b, ByteBuf buf)
{ {
// TODO: Check len - use Guava? Preconditions.checkArgument( b.length <= Short.MAX_VALUE, "Cannot send array longer than Short.MAX_VALUE (got %s bytes)", b.length );
buf.writeShort( b.length ); buf.writeShort( b.length );
buf.writeBytes( b ); buf.writeBytes( b );
} }
public static byte[] readArray(ByteBuf buf) public static byte[] readArray(ByteBuf buf)
{ {
// TODO: Check len - use Guava?
short len = buf.readShort(); short len = buf.readShort();
Preconditions.checkArgument( len <= Short.MAX_VALUE, "Cannot receive array longer than Short.MAX_VALUE (got %s bytes)", len );
byte[] ret = new byte[ len ]; byte[] ret = new byte[ len ];
buf.readBytes( ret ); buf.readBytes( ret );
return ret; return ret;