Skip to content

std: fix FreeBSD environ() null deref under crt-static #159097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
valentynkit wants to merge 1 commit into from
Closed

std: fix FreeBSD environ() null deref under crt-static #159097

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion library/std/src/sys/env/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,19 @@ pub unsafe fn environ() -> *mut *const *const c_char {

static ENVIRON: LazyLock<Environ> = LazyLock::new(|| {
Environ(unsafe {
libc::dlsym(libc::RTLD_DEFAULT, c"environ".as_ptr()) as *mut *const *const c_char
let dynamic =
libc::dlsym(libc::RTLD_DEFAULT, c"environ".as_ptr()) as *mut *const *const c_char;
if !dynamic.is_null() {
dynamic
} else {
// Reading an `extern_weak` static yields the symbol's address
// (null if unresolved), not its contents.
unsafe extern "C" {
#[linkage = "extern_weak"]
static environ: *mut *const *const c_char;
}
environ
}
})
});
ENVIRON.0
Expand Down
Loading