Mirrors/Velocity
3
0
Fork 1
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-09-29 14:40:21 +02:00
Code Issues Pakete Projekte Releases Wiki Aktivität

Clarifications in ProtocolUtils.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Andrew Steinborn 2019-01-05 14:55:01 -05:00
Ursprung 221ee510ff
Commit c30974a148
1 geänderte Dateien mit 7 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

12
proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java
Datei anzeigen

@ -69,9 +69,9 @@ public enum ProtocolUtils {
public static String readString(ByteBuf buf, int cap) { public static String readString(ByteBuf buf, int cap) {
int length = readVarInt(buf); int length = readVarInt(buf);
checkArgument(length >= 0, "Got a negative-length string (%s)", length); checkArgument(length >= 0, "Got a negative-length string (%s)", length);
// `cap` is interpreted as a UTF-8 character length, hence the multiplication by 4 - this covers // `cap` is interpreted as a UTF-8 character length. To cover the full Unicode plane, we must
// the full Unicode plane - a 4 byte character (surrogate) is the maximum. We do a later sanity // consider the length of a UTF-8 character, which can be up to a 4 bytes. We do an initial
// check to make sure our optimistic guess was good enough. // sanity check and then check again to make sure our optimistic guess was good.
checkArgument(length <= cap * 4, "Bad string size (got %s, maximum is %s)", length, cap); checkArgument(length <= cap * 4, "Bad string size (got %s, maximum is %s)", length, cap);
checkState(buf.isReadable(length), checkState(buf.isReadable(length),
"Trying to read a string that is too long (wanted %s, only have %s)", length, "Trying to read a string that is too long (wanted %s, only have %s)", length,
@ -107,9 +107,10 @@ public enum ProtocolUtils {
*/ */
public static byte[] readByteArray(ByteBuf buf, int cap) { public static byte[] readByteArray(ByteBuf buf, int cap) {
int length = readVarInt(buf); int length = readVarInt(buf);
checkArgument(length <= cap, "Bad string size (got %s, maximum is %s)", length, cap); checkArgument(length >= 0, "Got a negative-length array (%s)", length);
checkArgument(length <= cap, "Bad array size (got %s, maximum is %s)", length, cap);
checkState(buf.isReadable(length), checkState(buf.isReadable(length),
"Trying to read a string that is too long (wanted %s, only have %s)", length, "Trying to read an array that is too long (wanted %s, only have %s)", length,
buf.readableBytes()); buf.readableBytes());
byte[] array = new byte[length]; byte[] array = new byte[length];
buf.readBytes(array); buf.readBytes(array);
@ -128,6 +129,7 @@ public enum ProtocolUtils {
*/ */
public static int[] readIntegerArray(ByteBuf buf) { public static int[] readIntegerArray(ByteBuf buf) {
int len = readVarInt(buf); int len = readVarInt(buf);
checkArgument(len >= 0, "Got a negative-length integer array (%s)", len);
int[] array = new int[len]; int[] array = new int[len];
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
array[i] = readVarInt(buf); array[i] = readVarInt(buf);