rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Pass on null handle values to child process

Browse Source
This commit is contained in:
Chris Denton
2022-10-24 02:34:48 +01:00
parent 7aa3613908
commit c43210f67b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
library/std/src/sys/windows/process.rs
View File

@@ -513,9 +513,6 @@ fn program_exists(path: &Path) -> Option<Vec<u16>> {
impl Stdio { impl Stdio {
fn to_handle(&self, stdio_id: c::DWORD, pipe: &mut Option<AnonPipe>) -> io::Result<Handle> { fn to_handle(&self, stdio_id: c::DWORD, pipe: &mut Option<AnonPipe>) -> io::Result<Handle> {
match *self { match *self {
// If no stdio handle is available, then inherit means that it
// should still be unavailable so propagate the
// INVALID_HANDLE_VALUE.
Stdio::Inherit => match stdio::get_handle(stdio_id) { Stdio::Inherit => match stdio::get_handle(stdio_id) {
Ok(io) => unsafe { Ok(io) => unsafe {
let io = Handle::from_raw_handle(io); let io = Handle::from_raw_handle(io);
@@ -523,7 +520,8 @@ impl Stdio {
io.into_raw_handle(); io.into_raw_handle();
ret ret
}, },
Err(..) => unsafe { Ok(Handle::from_raw_handle(c::INVALID_HANDLE_VALUE)) }, // If no stdio handle is available, then propagate the null value.
Err(..) => unsafe { Ok(Handle::from_raw_handle(ptr::null_mut())) },
}, },
Stdio::MakePipe => { Stdio::MakePipe => {
@@ -730,9 +728,9 @@ fn zeroed_startupinfo() -> c::STARTUPINFO {
wShowWindow: 0, wShowWindow: 0,
cbReserved2: 0, cbReserved2: 0,
lpReserved2: ptr::null_mut(), lpReserved2: ptr::null_mut(),
hStdInput: c::INVALID_HANDLE_VALUE, hStdInput: ptr::null_mut(),
hStdOutput: c::INVALID_HANDLE_VALUE, hStdOutput: ptr::null_mut(),
hStdError: c::INVALID_HANDLE_VALUE, hStdError: ptr::null_mut(),
} }
} }