codec: LinesCodec should only return MaxLineLengthExceeded once per line (#3556)

This commit is contained in:
r-zig
2021-02-25 23:21:59 +01:00
committed by GitHub
parent 017a483b5e
commit 5756a005a6
2 changed files with 20 additions and 1 deletions
+1 -1
View File
@@ -133,7 +133,7 @@ impl Decoder for LinesCodec {
buf.advance(read_to);
self.next_index = 0;
if buf.is_empty() {
return Err(LinesCodecError::MaxLineLengthExceeded);
return Ok(None);
}
}
(false, Some(offset)) => {
+19
View File
@@ -201,7 +201,26 @@ fn lines_decoder_discard_repeat() {
buf.put_slice(b"aa");
assert!(codec.decode(buf).is_err());
buf.put_slice(b"a");
assert_eq!(None, codec.decode(buf).unwrap());
}
// Regression test for [subsequent calls to LinesCodec decode does not return the desired results bug](https://github.com/tokio-rs/tokio/issues/3555)
#[test]
fn lines_decoder_max_length_underrun_twice() {
const MAX_LENGTH: usize = 11;
let mut codec = LinesCodec::new_with_max_length(MAX_LENGTH);
let buf = &mut BytesMut::new();
buf.reserve(200);
buf.put_slice(b"line ");
assert_eq!(None, codec.decode(buf).unwrap());
buf.put_slice(b"too very l");
assert!(codec.decode(buf).is_err());
buf.put_slice(b"aaaaaaaaaaaaaaaaaaaaaaa");
assert_eq!(None, codec.decode(buf).unwrap());
buf.put_slice(b"ong\nshort\n");
assert_eq!("short", codec.decode(buf).unwrap().unwrap());
}
#[test]