TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-13 12:41:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make pointers NonNull after error check

Browse Source
This commit is contained in:
topjohnwu
2025-04-14 13:31:52 -07:00
committed by John Wu
parent f063fa5054
commit 30e79310ab
3 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
native/src/base/dir.rs
View File

@@ -178,9 +178,7 @@ impl Directory {
pub fn open(path: &Utf8CStr) -> OsResult<Directory> {
let dirp = unsafe { libc::opendir(path.as_ptr()) };
let dirp = dirp.as_os_result("opendir", Some(path), None)?;
Ok(Directory {
inner: unsafe { NonNull::new_unchecked(dirp) },
})
Ok(Directory { inner: dirp })
}
pub fn read(&mut self) -> OsResult<'static, Option<DirEntry>> {
@@ -424,9 +422,7 @@ impl TryFrom<OwnedFd> for Directory {
fn try_from(fd: OwnedFd) -> OsResult<'static, Self> {
let dirp = unsafe { libc::fdopendir(fd.into_raw_fd()) };
let dirp = dirp.as_os_result("fdopendir", None, None)?;
Ok(Directory {
inner: unsafe { NonNull::new_unchecked(dirp) },
})
Ok(Directory { inner: dirp })
}
}