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

Strengthen check in JavaVelocityCompressor

Browse Source
This commit is contained in:
Andrew Steinborn
2019-06-09 04:43:24 -04:00
parent b19d36e939
commit b0736548a9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
native/src/main/java/com/velocitypowered/natives/compression/JavaVelocityCompressor.java
View File

@@ -28,16 +28,16 @@ public class JavaVelocityCompressor implements VelocityCompressor {
public void inflate(ByteBuf source, ByteBuf destination, int max) throws DataFormatException { public void inflate(ByteBuf source, ByteBuf destination, int max) throws DataFormatException {
ensureNotDisposed(); ensureNotDisposed();
final int available = source.readableBytes();
if (source.hasArray()) { if (source.hasArray()) {
inflater.setInput(source.array(), source.arrayOffset() + source.readerIndex(), inflater.setInput(source.array(), source.arrayOffset() + source.readerIndex(), available);
source.readableBytes());
} else { } else {
byte[] inData = new byte[source.readableBytes()]; byte[] inData = new byte[available];
source.readBytes(inData); source.readBytes(inData);
inflater.setInput(inData); inflater.setInput(inData);
} }
while (!inflater.finished()) { while (!inflater.finished() && inflater.getBytesRead() < available) {
ensureMaxSize(destination, max); ensureMaxSize(destination, max);
int read = inflater.inflate(buf); int read = inflater.inflate(buf);
destination.writeBytes(buf, 0, read); destination.writeBytes(buf, 0, read);