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

Merge pull request #755 from jaens/3-spdy-fix-truncation-2

Browse Source 
SPDY: fix header block values truncation in decompression
This commit is contained in:
Jeff Pinner 2012-11-20 10:43:31 -08:00
commit 6f589dd12b
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameDecoder.java
View File

@ -544,8 +544,13 @@ public class SpdyFrameDecoder extends FrameDecoder {
return true; return true;
} }
// Perhaps last call to decode filled output buffer // Perhaps last call to decode filled output buffer
headerBlockDecompressor.decode(decompressed); int numBytes;
return decompressed.readableBytes() >= bytes; boolean done;
do {
numBytes = headerBlockDecompressor.decode(decompressed);
done = decompressed.readableBytes() >= bytes;
} while (!done && numBytes > 0);
return done;
} }
private int readLengthField() { private int readLengthField() {

2
src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockDecompressor.java
View File

@ -24,6 +24,6 @@ abstract class SpdyHeaderBlockDecompressor {
} }
abstract void setInput(ChannelBuffer compressed); abstract void setInput(ChannelBuffer compressed);
abstract void decode(ChannelBuffer decompressed) throws Exception; abstract int decode(ChannelBuffer decompressed) throws Exception;
abstract void end(); abstract void end();
} }

3
src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockZlibDecompressor.java
View File

@ -44,7 +44,7 @@ class SpdyHeaderBlockZlibDecompressor extends SpdyHeaderBlockDecompressor {
} }
@Override @Override
public void decode(ChannelBuffer decompressed) throws Exception { public int decode(ChannelBuffer decompressed) throws Exception {
try { try {
int numBytes = decompressor.inflate(out); int numBytes = decompressor.inflate(out);
if (numBytes == 0 && decompressor.needsDictionary()) { if (numBytes == 0 && decompressor.needsDictionary()) {
@ -56,6 +56,7 @@ class SpdyHeaderBlockZlibDecompressor extends SpdyHeaderBlockDecompressor {
numBytes = decompressor.inflate(out); numBytes = decompressor.inflate(out);
} }
decompressed.writeBytes(out, 0, numBytes); decompressed.writeBytes(out, 0, numBytes);
return numBytes;
} catch (DataFormatException e) { } catch (DataFormatException e) {
throw new SpdyProtocolException( throw new SpdyProtocolException(
"Received invalid header block", e); "Received invalid header block", e);