MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Handle partially sent varints better

Browse Source
This commit is contained in:
Andrew Steinborn
2020-05-29 21:11:21 -04:00
parent b6f1dcc166
commit dd2e1ad241
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java
View File

@@ -20,18 +20,26 @@ public class MinecraftVarintFrameDecoder extends ByteToMessageDecoder {
return; return;
} }
if (!reader.successfulDecode) { if (reader.successfulDecode) {
throw BAD_LENGTH_CACHED; if (reader.readVarint < 0) {
} throw BAD_LENGTH_CACHED;
}
int minimumRead = reader.bytesRead + reader.readVarint; int minimumRead = reader.bytesRead + reader.readVarint;
if (in.isReadable(minimumRead)) { if (in.isReadable(minimumRead)) {
out.add(in.retainedSlice(varintEnd + 1, reader.readVarint)); out.add(in.retainedSlice(varintEnd + 1, reader.readVarint));
in.skipBytes(minimumRead); in.skipBytes(minimumRead);
reader.reset(); reader.reset();
} else {
reader.reset();
return;
}
} else { } else {
boolean tooBig = reader.bytesRead > 3;
reader.reset(); reader.reset();
return; if (tooBig) {
throw BAD_LENGTH_CACHED;
}
} }
} }
} }