GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2026-01-08 03:23:54 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

refactor, fix: dlerror may return null

Browse source
This commit is contained in:
llama 2025-11-12 21:14:50 +08:00
parent d690a0aa6c
commit f037e260c0
No known key found for this signature in database
GPG key ID: 0B7543854B9413C3
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
qt/launcher/src/platform/nix.rs
View file

@ -21,22 +21,30 @@ impl Drop for PyFfi {
}
}
macro_rules! load_sym {
($lib:expr, $name:expr) => {{
libc::dlerror();
let sym = libc::dlsym($lib, $name.as_ptr());
if sym.is_null() {
let dlerror_str = CStr::from_ptr(libc::dlerror()).to_str()?;
anyhow::bail!("failed to load {}: {dlerror_str}", $name.to_string_lossy());
}
std::mem::transmute(sym)
}};
}
macro_rules! ffi {
($lib:expr, $exec:expr, $($field:ident),* $(,)?) => {
#[allow(clippy::missing_transmute_annotations)] // they're not missing
PyFfi { exec: $exec, $($field: load_sym!($lib, ::std::ffi::CString::new(stringify!($field)).map_err(|_| anyhow::anyhow!("failed to construct symbol CString"))?),)* lib: $lib, }
#[allow(clippy::missing_transmute_annotations)]
$crate::platform::PyFfi {
exec: $exec,
$($field: {
::libc::dlerror();
let name = ::std::ffi::CString::new(stringify!($field)).map_err(|_| ::anyhow::anyhow!("failed to construct sym"))?;
let sym = ::libc::dlsym($lib, name.as_ptr());
if sym.is_null() {
let dlerror_ptr = ::libc::dlerror();
let dlerror_str = if !dlerror_ptr.is_null() {
::std::ffi::CStr::from_ptr(dlerror_ptr)
.to_str()
.unwrap_or_default()
} else {
""
};
::anyhow::bail!("failed to load {}: {dlerror_str}", stringify!($field));
}
::std::mem::transmute(sym)
},)*
lib: $lib,
}
};
}