4032b7a429
This commit, after reverting #55359, applies a different fix for #46775 while also fixing #55775. The basic idea was to go back to pre-#55359 libstd, and then fix #46775 in a way that doesn't expose #55775. The issue described in #46775 boils down to two problems: * First, the global environment is reset during `exec` but, but if the `exec` call fails then the global environment was a dangling pointer into free'd memory as the block of memory was deallocated when `Command` is dropped. This is fixed in this commit by installing a `Drop` stack object which ensures that the `environ` pointer is preserved on a failing `exec`. * Second, the global environment was accessed in an unsynchronized fashion during `exec`. This was fixed by ensuring that the Rust-specific environment lock is acquired for these system-level operations. Thanks to Alex Gaynor for pioneering the solution here! Closes #55775 Co-authored-by: Alex Gaynor <alex.gaynor@gmail.com>
111 lines
3.7 KiB
Rust
111 lines
3.7 KiB
Rust
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
#![allow(stable_features)]
|
|
// ignore-windows - this is a unix-specific test
|
|
// ignore-pretty issue #37199
|
|
// ignore-cloudabi no processes
|
|
// ignore-emscripten no processes
|
|
|
|
#![feature(process_exec)]
|
|
|
|
use std::env;
|
|
use std::os::unix::process::CommandExt;
|
|
use std::process::Command;
|
|
|
|
fn main() {
|
|
let mut args = env::args();
|
|
let me = args.next().unwrap();
|
|
|
|
if let Some(arg) = args.next() {
|
|
match &arg[..] {
|
|
"test1" => println!("passed"),
|
|
|
|
"exec-test1" => {
|
|
let err = Command::new(&me).arg("test1").exec();
|
|
panic!("failed to spawn: {}", err);
|
|
}
|
|
|
|
"exec-test2" => {
|
|
Command::new("/path/to/nowhere").exec();
|
|
println!("passed");
|
|
}
|
|
|
|
"exec-test3" => {
|
|
Command::new(&me).arg("bad\0").exec();
|
|
println!("passed");
|
|
}
|
|
|
|
"exec-test4" => {
|
|
Command::new(&me).current_dir("/path/to/nowhere").exec();
|
|
println!("passed");
|
|
}
|
|
|
|
"exec-test5" => {
|
|
env::set_var("VARIABLE", "ABC");
|
|
Command::new("definitely-not-a-real-binary").env("VARIABLE", "XYZ").exec();
|
|
assert_eq!(env::var("VARIABLE").unwrap(), "ABC");
|
|
println!("passed");
|
|
}
|
|
|
|
"exec-test6" => {
|
|
let err = Command::new("echo").arg("passed").env_clear().exec();
|
|
panic!("failed to spawn: {}", err);
|
|
}
|
|
|
|
"exec-test7" => {
|
|
let err = Command::new("echo").arg("passed").env_remove("PATH").exec();
|
|
panic!("failed to spawn: {}", err);
|
|
}
|
|
|
|
_ => panic!("unknown argument: {}", arg),
|
|
}
|
|
return
|
|
}
|
|
|
|
let output = Command::new(&me).arg("exec-test1").output().unwrap();
|
|
assert!(output.status.success());
|
|
assert!(output.stderr.is_empty());
|
|
assert_eq!(output.stdout, b"passed\n");
|
|
|
|
let output = Command::new(&me).arg("exec-test2").output().unwrap();
|
|
assert!(output.status.success());
|
|
assert!(output.stderr.is_empty());
|
|
assert_eq!(output.stdout, b"passed\n");
|
|
|
|
let output = Command::new(&me).arg("exec-test3").output().unwrap();
|
|
assert!(output.status.success());
|
|
assert!(output.stderr.is_empty());
|
|
assert_eq!(output.stdout, b"passed\n");
|
|
|
|
let output = Command::new(&me).arg("exec-test4").output().unwrap();
|
|
assert!(output.status.success());
|
|
assert!(output.stderr.is_empty());
|
|
assert_eq!(output.stdout, b"passed\n");
|
|
|
|
let output = Command::new(&me).arg("exec-test5").output().unwrap();
|
|
assert!(output.status.success());
|
|
assert!(output.stderr.is_empty());
|
|
assert_eq!(output.stdout, b"passed\n");
|
|
|
|
if cfg!(target_os = "linux") {
|
|
let output = Command::new(&me).arg("exec-test6").output().unwrap();
|
|
println!("{:?}", output);
|
|
assert!(output.status.success());
|
|
assert!(output.stderr.is_empty());
|
|
assert_eq!(output.stdout, b"passed\n");
|
|
|
|
let output = Command::new(&me).arg("exec-test7").output().unwrap();
|
|
println!("{:?}", output);
|
|
assert!(output.status.success());
|
|
assert!(output.stderr.is_empty());
|
|
assert_eq!(output.stdout, b"passed\n");
|
|
}
|
|
}
|