mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-06 06:17:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix conversion from BytesVec to BytesMut and back (BytesVec::with_bytes_mut())

Browse source
This commit is contained in:
Nikolay Kim 2022-01-31 15:17:16 +06:00
parent 1baf305b1f
commit 767dd91b7e
6 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ntex-bytes/src/bytes.rs
View file

@ -2730,7 +2730,9 @@ impl InnerVec {
)
} else if kind == KIND_VEC {
let ptr = buf.inner.shared_vec();
let offset = buf.inner.arc.as_ptr() as usize - ptr as usize;
let offset = buf.inner.ptr as usize - ptr as usize;
// we cannot use shared vec if BytesMut points to inside of vec
if buf.inner.cap < (*ptr).cap - offset {
InnerVec::from_slice(
buf.inner.capacity(),
@ -2738,11 +2740,11 @@ impl InnerVec {
buf.inner.pool(),
)
} else {
// BytesMut owns rest of the vec, so re-use
(*ptr).len = buf.len() as u32;
(*ptr).offset = offset as u32;
let inner = InnerVec(NonNull::new_unchecked(ptr));
// reuse bytes
mem::forget(buf);
mem::forget(buf); // reuse bytes
inner
}
} else {