Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #155318 - Zoxc:ub-issue-50, r=ChrisDenton

Browse Source 
Use mutable pointers for Unix path buffers

This gets mutable pointers for Unix path buffers to ensure they have the right provenance.
This commit is contained in:
Stuart Cook
2026-04-17 16:17:51 +10:00
committed by GitHub
parent 3c61fba50b 7a47964d3f
commit b7ea9df119
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
library/std/src/sys/fs/unix.rs
+2 -2
View File
@@ -339,7 +339,7 @@ fn get_path(fd: c_int) -> Option<PathBuf> {
// alternatives. If a better method is invented, it should be used
// instead.
let mut buf = vec![0; libc::PATH_MAX as usize];
let n = unsafe { libc::fcntl(fd, libc::F_GETPATH, buf.as_ptr()) };
let n = unsafe { libc::fcntl(fd, libc::F_GETPATH, buf.as_mut_ptr()) };
if n == -1 {
cfg_select! {
target_os = "netbsd" => {
@@ -375,7 +375,7 @@ fn get_path(fd: c_int) -> Option<PathBuf> {
#[cfg(target_os = "vxworks")]
fn get_path(fd: c_int) -> Option<PathBuf> {
let mut buf = vec![0; libc::PATH_MAX as usize];
let n = unsafe { libc::ioctl(fd, libc::FIOGETNAME, buf.as_ptr()) };
let n = unsafe { libc::ioctl(fd, libc::FIOGETNAME, buf.as_mut_ptr()) };
if n == -1 {
return None;
}
library/std/src/sys/paths/unix.rs
+1 -1
View File
@@ -207,7 +207,7 @@ fn sysctl() -> io::Result<PathBuf> {
cvt(libc::sysctl(
mib.as_ptr(),
mib.len() as libc::c_uint,
path.as_ptr() as *mut libc::c_void,
path.as_mut_ptr() as *mut libc::c_void,
&mut path_len,
ptr::null(),
0,