Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/bytes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,15 @@ impl Buf for Bytes {
self.len(),
);

if cnt == self.len() {
// Advancing to the end leaves an empty `Bytes`, whose length can
// never grow again. Release the shared reference instead of
// retaining it, matching `truncate(0)` and `split_to(self.len())`.
let end_ptr = self.ptr.wrapping_add(cnt);
drop(mem::replace(self, Bytes::new_empty_with_ptr(end_ptr)));
return;
}

unsafe {
self.inc_start(cnt);
}
Expand Down
25 changes: 25 additions & 0 deletions tests/test_bytes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,31 @@ fn truncate_to_zero_releases_shared_reference() {
assert!(remaining.try_into_mut().is_err());
}

#[test]
fn advance_to_end_releases_shared_reference() {
let mut bytes = BytesMut::from(&b"hello"[..]);
drop(bytes.split_off(bytes.len()));
let mut advanced = bytes.freeze();
let remaining = advanced.clone();

advanced.advance(5);

assert!(advanced.is_empty());
let mut remaining = remaining.try_into_mut().unwrap();
remaining[0] = b'H';
assert_eq!(remaining, b"Hello"[..]);

let mut bytes = BytesMut::from(&b"hello"[..]);
drop(bytes.split_off(bytes.len()));
let mut nonempty = bytes.freeze();
let remaining = nonempty.clone();

nonempty.advance(4);

assert_eq!(nonempty, b"o"[..]);
assert!(remaining.try_into_mut().is_err());
}

#[test]
fn freeze_clone_shared() {
let s = &b"abcdefgh"[..];
Expand Down