Unified · Split
| @@ -26,22 +26,12 @@ pub mod io { · 25 unmodified lines | |||
| 26 | r.read(buf) | 26 | r.read(buf) |
| 27 | } else { | 27 | } else { |
| 28 | // We must assure we return at least one byte - otherwise it's considered EOF, thus '>=' | 28 | // We must assure we return at least one byte - otherwise it's considered EOF, thus '>=' |
| 29 | if *header_size_left >= buf.len() { | 29 | while *header_size_left != 0 { |
| 30 | { | 30 | let bytes_to_read = buf.len().min(*header_size_left); |
| 31 | let mut tmp = [0u8; 32]; | 31 | r.read_exact(&mut buf[..bytes_to_read])?; |
| 32 | assert!( | 32 | *header_size_left -= bytes_to_read; |
| 33 | *header_size_left <= tmp.len(), | ||
| 34 | "encountered unusually large header" | ||
| 35 | ); | ||
| 36 | r.read_exact(&mut tmp[..*header_size_left])?; | ||
| 37 | *header_size_left = 0; | ||
| 38 | } | ||
| 39 | r.read(buf) | ||
| 40 | } else { | ||
| 41 | r.read_exact(&mut buf[..*header_size_left])?; | ||
| 42 | *header_size_left = 0; | ||
| 43 | r.read(buf) | ||
| 44 | } | 33 | } |
| 34 | r.read(buf) | ||
| 45 | } | 35 | } |
| 46 | } | 36 | } |
| 47 | } | 37 | } |