TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-22 16:07:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Borrow value instead of moving in FsPath::from()

Browse Source 
When accepting a value of AsRef<Utf8CStr> in FsPath::from(), the
existing code will move a value of Utf8CStrBufArr, creating a reference
that lives longer than the borrowing value, causing undefined behavior.

The issue is only visible on release builds, as more advanced
optimizations will be more aggressive re-using the stack of variables
that no longer lives.

Fix #7408
This commit is contained in:
topjohnwu 2023-10-11 23:48:54 -07:00
parent 587b6cfd41
commit eda8c70a80
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
native/src/base/cstr.rs
View File

@ -385,12 +385,12 @@ pub struct FsPath(Utf8CStr);
impl FsPath { impl FsPath {
#[inline(always)] #[inline(always)]
pub fn from<'a, T: AsRef<Utf8CStr>>(value: T) -> &'a FsPath { pub fn from<T: AsRef<Utf8CStr> + ?Sized>(value: &T) -> &FsPath {
unsafe { mem::transmute(value.as_ref()) } unsafe { mem::transmute(value.as_ref()) }
} }
#[inline(always)] #[inline(always)]
pub fn from_mut<'a, T: AsMut<Utf8CStr>>(mut value: T) -> &'a mut FsPath { pub fn from_mut<T: AsMut<Utf8CStr> + ?Sized>(value: &mut T) -> &mut FsPath {
unsafe { mem::transmute(value.as_mut()) } unsafe { mem::transmute(value.as_mut()) }
} }
} }

4
native/src/base/files.rs
View File

@ -229,13 +229,13 @@ impl DirEntry<'_> {
pub fn get_attr(&self) -> io::Result<FileAttr> { pub fn get_attr(&self) -> io::Result<FileAttr> {
let mut path = Utf8CStrBufArr::default(); let mut path = Utf8CStrBufArr::default();
self.path(&mut path)?; self.path(&mut path)?;
FsPath::from(path).get_attr() FsPath::from(&path).get_attr()
} }
pub fn set_attr(&self, attr: &FileAttr) -> io::Result<()> { pub fn set_attr(&self, attr: &FileAttr) -> io::Result<()> {
let mut path = Utf8CStrBufArr::default(); let mut path = Utf8CStrBufArr::default();
self.path(&mut path)?; self.path(&mut path)?;
FsPath::from(path).set_attr(attr) FsPath::from(&path).set_attr(attr)
} }
} }