RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 22:28:12 +00:00
Code Issues Activity Actions

Shell: Don't assume that only the current shell may continue children

Browse source 
That can happen because of anyone sending the process a SIGCONT.
Fixes an issue where continuing a process launched by the shell from
the System Monitor would cause the shell to spin on waitpid().
This commit is contained in:
Ali Mohammad Pur 2021-07-16 23:10:03 +04:30 • committed by Ali Mohammad Pur
parent 459aa44f6b
commit 124ca30d49
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Shell/Shell.cpp
View file

@ -1759,10 +1759,11 @@ void Shell::notify_child_event()
} }
if (child_pid == 0) { if (child_pid == 0) {
// If the child existed, but wasn't dead. // If the child existed, but wasn't dead.
if (job.is_suspended() && job.shell_did_continue()) { if (job.is_suspended() || job.shell_did_continue()) {
// The job was suspended, and we sent it a SIGCONT. // The job was suspended, and someone sent it a SIGCONT.
job.set_is_suspended(false); job.set_is_suspended(false);
job.set_shell_did_continue(false); if (job.shell_did_continue())
job.set_shell_did_continue(false);
found_child = true; found_child = true;
} }
continue; continue;