nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 15:23:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use sockaddr_un in unix SocketAddr::from_path

Browse Source
This commit is contained in:
Thomas de Zeeuw 2022-01-27 09:54:28 +01:00
parent ca9a3c9a9f
commit 4acb8ac46c
1 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
library/std/src/os/unix/net/addr.rs
View File

@ -164,41 +164,7 @@ impl SocketAddr {
where
P: AsRef<Path>,
{
// SAFETY: All zeros is a valid representation for `sockaddr_un`.
let mut storage: libc::sockaddr_un = unsafe { mem::zeroed() };
let bytes = path.as_ref().as_os_str().as_bytes();
if bytes.contains(&b'\0') {
return Err(io::Error::new(
io::ErrorKind::InvalidInput,
"path can't contain null bytes",
));
} else if bytes.len() >= storage.sun_path.len() {
return Err(io::Error::new(
io::ErrorKind::InvalidInput,
"path must be shorter than SUN_LEN",
));
}
storage.sun_family = libc::AF_UNIX as _;
// SAFETY: `bytes` and `addr.sun_path` are not overlapping and
// both point to valid memory.
// NOTE: We zeroed the memory above, so the path is already null
// terminated.
unsafe {
ptr::copy_nonoverlapping(
bytes.as_ptr(),
storage.sun_path.as_mut_ptr().cast(),
bytes.len(),
)
};
let base = &storage as *const _ as usize;
let path = &storage.sun_path as *const _ as usize;
let sun_path_offset = path - base;
let length = sun_path_offset + bytes.len() + 1;
Ok(SocketAddr { addr: storage, len: length as _ })
sockaddr_un(path.as_ref()).map(|(addr, len)| SocketAddr { addr, len })
}
/// Returns `true` if the address is unnamed.