mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid misalign

Browse Source
This commit is contained in:
Kai Luo 2023-03-24 10:25:52 +08:00
parent 6e8a8282b8
commit 5aad51098d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/rustc_session/src/filesearch.rs
View File

@ -85,15 +85,20 @@ fn current_dll_path() -> Result<PathBuf, String> {
#[cfg(target_os = "aix")] #[cfg(target_os = "aix")]
unsafe { unsafe {
let addr = current_dll_path as u64; let addr = current_dll_path as u64;
let mut buffer = vec![0i8; 4096]; let mut buffer = vec![std::mem::zeroed::<libc::ld_info>(); 64];
loop { loop {
if libc::loadquery(libc::L_GETINFO, buffer.as_mut_ptr(), buffer.len() as u32) >= 0 { if libc::loadquery(
libc::L_GETINFO,
buffer.as_mut_ptr() as *mut i8,
(std::mem::size_of::<libc::ld_info>() * buffer.len()) as u32,
) >= 0
{
break; break;
} else { } else {
if std::io::Error::last_os_error().raw_os_error().unwrap() != libc::ENOMEM { if std::io::Error::last_os_error().raw_os_error().unwrap() != libc::ENOMEM {
return Err("loadquery failed".into()); return Err("loadquery failed".into());
} }
buffer.resize(buffer.len() * 2, 0i8); buffer.resize(buffer.len() * 2, std::mem::zeroed::<libc::ld_info>());
} }
} }
let mut current = buffer.as_mut_ptr() as *mut libc::ld_info; let mut current = buffer.as_mut_ptr() as *mut libc::ld_info;