bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

core: panic on overflow in BorrowedCursor

Browse source
This commit is contained in:
joboet 2024-04-11 18:33:46 +02:00
parent 05ccc49a44
commit 91fe6f9343
No known key found for this signature in database
GPG key ID: 704E0149B0194B3C
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
library/core/src/io/borrowed_buf.rs
View file

@ -249,9 +249,10 @@ impl<'a> BorrowedCursor<'a> {
/// Panics if there are less than `n` bytes initialized. /// Panics if there are less than `n` bytes initialized.
#[inline] #[inline]
pub fn advance(&mut self, n: usize) -> &mut Self { pub fn advance(&mut self, n: usize) -> &mut Self {
assert!(self.buf.init >= self.buf.filled + n); let filled = self.buf.filled.strict_add(n);
assert!(filled <= self.buf.init);
self.buf.filled += n; self.buf.filled = filled;
self self
} }

9
library/std/src/io/tests.rs
View file

@ -209,6 +209,15 @@ fn read_buf_exact() {
assert_eq!(c.read_buf_exact(buf.unfilled()).unwrap_err().kind(), io::ErrorKind::UnexpectedEof); assert_eq!(c.read_buf_exact(buf.unfilled()).unwrap_err().kind(), io::ErrorKind::UnexpectedEof);
} }
#[test]
#[should_panic]
fn borrowed_cursor_advance_overflow() {
let mut buf = [0; 512];
let mut buf = BorrowedBuf::from(&mut buf[..]);
buf.unfilled().advance(1);
buf.unfilled().advance(usize::MAX);
}
#[test] #[test]
fn take_eof() { fn take_eof() {
struct R; struct R;