actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-24 08:22:59 +01:00
Code Issues Releases Wiki Activity

fix end-of-stream handling in parse_payload

Browse Source 
parse_payload can be called with a pre-filled buf.

In this case, it's totaly fine for read_from_io to return
sync::Ready(0) while buf is not empty. This is not an
PayloadError::Incomplete.

So, move the check for PayloadError::Incomplete down to the
decoding code: If the decoder is not ready, but the input stream
is finished, PayloadError::Incomplete will be returned.
This commit is contained in:
Jan Niehusmann 2018-04-12 09:47:32 +02:00
parent d39b531537
commit 72bc1546c4
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/parser.rs
View File

@ -81,16 +81,11 @@ impl HttpResponseParser {
if self.decoder.is_some() { if self.decoder.is_some() {
loop { loop {
// read payload // read payload
let not_ready = match utils::read_from_io(io, buf) { let (not_ready, stream_finished) = match utils::read_from_io(io, buf) {
Ok(Async::Ready(0)) => { Ok(Async::Ready(0)) => (false, true),
if buf.is_empty() {
return Err(PayloadError::Incomplete)
}
true
}
Err(err) => return Err(err.into()), Err(err) => return Err(err.into()),
Ok(Async::NotReady) => true, Ok(Async::NotReady) => (true, false),
_ => false, _ => (false, false),
}; };
match self.decoder.as_mut().unwrap().decode(buf) { match self.decoder.as_mut().unwrap().decode(buf) {
@ -104,6 +99,9 @@ impl HttpResponseParser {
if not_ready { if not_ready {
return Ok(Async::NotReady) return Ok(Async::NotReady)
} }
if stream_finished {
return Err(PayloadError::Incomplete)
}
} }
Err(err) => return Err(err.into()), Err(err) => return Err(err.into()),
} }