github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-21 09:12:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor deferred_process handling to be more clearly safe

Browse Source 
The previous layout confused me for a minute as it suggested it was
possible for `pipe_next_read` to be moved twice (once in the first
conditional block, then again when the deferred process conditional
called `continue` - if and only if the deferred process *was* the last
process in the job. This patch clarifies that can't be the case.
This commit is contained in:
Mahmoud Al-Qudsi 2021-08-17 20:10:19 -05:00
parent c014c23662
commit 3291102045
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/exec.cpp
View File

@ -1076,12 +1076,15 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const io_chain_t &bl
}
pipe_next_read = std::move(pipes->read);
proc_pipes.write = std::move(pipes->write);
}
// Save any deferred process for last.
if (p == deferred_process) {
deferred_pipes = std::move(proc_pipes);
continue;
// Save any deferred process for last. By definition, the deferred process can never be
// the last process in the job, so it's safe to nest this in the outer
// `if (!p->is_last_in_job)` block, which makes it clear that `proc_next_read` will
// always be assigned when we `continue` the loop.
if (p == deferred_process) {
deferred_pipes = std::move(proc_pipes);
continue;
}
}
// Regular process.