itsscb/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2025-09-28 12:10:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

process: drop pipe after child exits in wait_with_output (#4315)

Browse Source
This commit is contained in:
Alice Ryhl 2022-01-10 11:40:28 +01:00 committed by GitHub
parent c800deaacc
commit 1601de1196
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tokio/src/process/mod.rs
View File

@ -1130,19 +1130,26 @@ impl Child {
pub async fn wait_with_output(mut self) -> io::Result<Output> {
use crate::future::try_join3;
async fn read_to_end<A: AsyncRead + Unpin>(io: Option<A>) -> io::Result<Vec<u8>> {
async fn read_to_end<A: AsyncRead + Unpin>(io: &mut Option<A>) -> io::Result<Vec<u8>> {
let mut vec = Vec::new();
if let Some(mut io) = io {
crate::io::util::read_to_end(&mut io, &mut vec).await?;
if let Some(io) = io.as_mut() {
crate::io::util::read_to_end(io, &mut vec).await?;
}
Ok(vec)
}
let stdout_fut = read_to_end(self.stdout.take());
let stderr_fut = read_to_end(self.stderr.take());
let mut stdout_pipe = self.stdout.take();
let mut stderr_pipe = self.stderr.take();
let stdout_fut = read_to_end(&mut stdout_pipe);
let stderr_fut = read_to_end(&mut stderr_pipe);
let (status, stdout, stderr) = try_join3(self.wait(), stdout_fut, stderr_fut).await?;
// Drop happens after `try_join` due to <https://github.com/tokio-rs/tokio/issues/4309>
drop(stdout_pipe);
drop(stderr_pipe);
Ok(Output {
status,
stdout,