liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wstr: Fix provenance in WString::from_buf_unchecked 

Get a pointer with provenance over the whole buffer, instead of a
pointer with provenance only to the initialized part.
This commit is contained in:
Moulins 2022-08-13 00:56:12 +02:00 committed by Mike Welsh
parent a678a39e85
commit 8806e9921a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wstr/src/buf.rs
View File

@ -50,15 +50,14 @@ impl WString {
pub unsafe fn from_buf_unchecked(buf: Units<Vec<u8>, Vec<u16>>) -> Self {
// SAFETY: we take ownership of the buffer; avoid double frees
let mut buf = ManuallyDrop::new(buf);
let (cap, ptr) = match buf.deref_mut() {
Units::Bytes(buf) => (buf.capacity(), Units::Bytes(&mut buf[..] as *mut _)),
Units::Wide(buf) => (buf.capacity(), Units::Wide(&mut buf[..] as *mut _)),
let (cap, len, ptr, is_wide) = match buf.deref_mut() {
Units::Bytes(buf) => (buf.capacity(), buf.len(), buf.as_mut_ptr() as *mut _, false),
Units::Wide(buf) => (buf.capacity(), buf.len(), buf.as_mut_ptr() as *mut _, true),
};
let wstr = ptr::from_units(ptr);
Self {
data: NonNull::new_unchecked(ptr::data(wstr)),
meta: ptr::metadata(wstr),
data: NonNull::new_unchecked(ptr),
meta: ptr::WStrMetadata::new(len, is_wide),
capacity: cap as u32,
}
}