andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

JdkZlibDecoder and JZlibDecoder consistency

Browse Source 
Motivation:
JdkZlibDecoder will allocate a new buffer when the previous buffer is filled with inflated data, but JZlibDecoder will attempt to use the same buffer by resizing. This leads to inconsistent results when these two decoders that are intended to be functionality equivalent.

Modifications:
- JdkZlibDecoder should attempt to resize and reuse the existing buffer instead of creating multiple buffers

Result:
Fixes https://github.com/netty/netty/issues/6804
This commit is contained in:
Scott Mitchell 2017-06-05 15:41:34 -07:00
parent e4b69bd61f
commit 19be3fe5f2
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
codec/src/main/java/io/netty/handler/codec/compression/JZlibDecoder.java
View File

@ -107,16 +107,15 @@ public class JZlibDecoder extends ZlibDecoder {
z.next_in = array;
z.next_in_index = 0;
}
int oldNextInIndex = z.next_in_index;
final int oldNextInIndex = z.next_in_index;
// Configure output.
int maxOutputLength = inputLength << 1;
ByteBuf decompressed = ctx.alloc().heapBuffer(maxOutputLength);
ByteBuf decompressed = ctx.alloc().heapBuffer(inputLength << 1);
try {
loop: for (;;) {
z.avail_out = maxOutputLength;
decompressed.ensureWritable(maxOutputLength);
decompressed.ensureWritable(z.avail_in << 1);
z.avail_out = decompressed.writableBytes();
z.next_out = decompressed.array();
z.next_out_index = decompressed.arrayOffset() + decompressed.writerIndex();
int oldNextOutIndex = z.next_out_index;

19
codec/src/main/java/io/netty/handler/codec/compression/JdkZlibDecoder.java
View File

@ -167,25 +167,14 @@ public class JdkZlibDecoder extends ZlibDecoder {
inflater.setInput(array);
}
int maxOutputLength = inflater.getRemaining() << 1;
ByteBuf decompressed = ctx.alloc().heapBuffer(maxOutputLength);
ByteBuf decompressed = ctx.alloc().heapBuffer(inflater.getRemaining() << 1);
try {
boolean readFooter = false;
byte[] outArray = decompressed.array();
while (!inflater.needsInput()) {
byte[] outArray = decompressed.array();
int writerIndex = decompressed.writerIndex();
int outIndex = decompressed.arrayOffset() + writerIndex;
int length = decompressed.writableBytes();
if (length == 0) {
// completely filled the buffer allocate a new one and start to fill it
out.add(decompressed);
decompressed = ctx.alloc().heapBuffer(maxOutputLength);
outArray = decompressed.array();
continue;
}
int outputLength = inflater.inflate(outArray, outIndex, length);
int outputLength = inflater.inflate(outArray, outIndex, decompressed.writableBytes());
if (outputLength > 0) {
decompressed.writerIndex(writerIndex + outputLength);
if (crc != null) {
@ -208,6 +197,8 @@ public class JdkZlibDecoder extends ZlibDecoder {
readFooter = true;
}
break;
} else {
decompressed.ensureWritable(inflater.getRemaining() << 1);
}
}