mirror of
https://github.com/tokio-rs/bytes.git
synced 2026-08-28 00:00:17 +02:00
Fix Bytes::is_unique when created from shared BytesMut (#718)
The `is_unique` entry in the vtable for `Bytes` created from a shared `BytesMut` just called the `shared_is_unique` function from the `bytes` module. However, that function dereferences the `data` argument` as `bytes::Shared`, but the actual underlying type is `bytes_mut::Shared`.
This commit is contained in:
+7
-1
@@ -1698,7 +1698,7 @@ unsafe fn rebuild_vec(ptr: *mut u8, mut len: usize, mut cap: usize, off: usize)
|
|||||||
static SHARED_VTABLE: Vtable = Vtable {
|
static SHARED_VTABLE: Vtable = Vtable {
|
||||||
clone: shared_v_clone,
|
clone: shared_v_clone,
|
||||||
to_vec: shared_v_to_vec,
|
to_vec: shared_v_to_vec,
|
||||||
is_unique: crate::bytes::shared_is_unique,
|
is_unique: shared_v_is_unique,
|
||||||
drop: shared_v_drop,
|
drop: shared_v_drop,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1732,6 +1732,12 @@ unsafe fn shared_v_to_vec(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> V
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsafe fn shared_v_is_unique(data: &AtomicPtr<()>) -> bool {
|
||||||
|
let shared = data.load(Ordering::Acquire);
|
||||||
|
let ref_count = (*shared.cast::<Shared>()).ref_count.load(Ordering::Relaxed);
|
||||||
|
ref_count == 1
|
||||||
|
}
|
||||||
|
|
||||||
unsafe fn shared_v_drop(data: &mut AtomicPtr<()>, _ptr: *const u8, _len: usize) {
|
unsafe fn shared_v_drop(data: &mut AtomicPtr<()>, _ptr: *const u8, _len: usize) {
|
||||||
data.with_mut(|shared| {
|
data.with_mut(|shared| {
|
||||||
release_shared(*shared as *mut Shared);
|
release_shared(*shared as *mut Shared);
|
||||||
|
|||||||
@@ -1172,3 +1172,12 @@ fn shared_is_unique() {
|
|||||||
drop(b);
|
drop(b);
|
||||||
assert!(c.is_unique());
|
assert!(c.is_unique());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn mut_shared_is_unique() {
|
||||||
|
let mut b = BytesMut::from(LONG);
|
||||||
|
let c = b.split().freeze();
|
||||||
|
assert!(!c.is_unique());
|
||||||
|
drop(b);
|
||||||
|
assert!(c.is_unique());
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user