KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reset the sigprocmask and signal handlers when launching child processes. Fixes #1806

Browse Source
This commit is contained in:
Kovid Goyal 2019-07-18 09:26:31 +05:30
parent f5cf6c1dcb
commit 5521d6b623
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kitty/child.c
View File

@ -78,8 +78,14 @@ spawn(PyObject *self UNUSED, PyObject *args) {
pid_t pid = fork(); pid_t pid = fork();
switch(pid) { switch(pid) {
case 0: case 0: {
// child // child
sigset_t signals = {0};
struct sigaction act = {.sa_handler=SIG_DFL};
#define SA(which) { if (sigaction(which, &act, NULL) != 0) exit_on_err("sigaction() in child process failed"); }
SA(SIGINT); SA(SIGTERM); SA(SIGCHLD);
#undef SA
if (sigprocmask(SIG_SETMASK, &signals, NULL) != 0) exit_on_err("sigprocmask() in child process failed");
// Use only signal-safe functions (man 7 signal-safety) // Use only signal-safe functions (man 7 signal-safety)
if (chdir(cwd) != 0) { if (chdir("/") != 0) {} }; // ignore failure to chdir to / if (chdir(cwd) != 0) { if (chdir("/") != 0) {} }; // ignore failure to chdir to /
if (setsid() == -1) exit_on_err("setsid() in child process failed"); if (setsid() == -1) exit_on_err("setsid() in child process failed");
@ -129,6 +135,7 @@ spawn(PyObject *self UNUSED, PyObject *args) {
execlp("sh", "sh", "-c", "read w", NULL); execlp("sh", "sh", "-c", "read w", NULL);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
break; break;
}
case -1: case -1:
PyErr_SetFromErrno(PyExc_OSError); PyErr_SetFromErrno(PyExc_OSError);
break; break;