diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-05-21 18:22:24 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-05-21 18:22:24 +0000 |
| commit | c605503df6b5f265e65b5017870417401d969555 (patch) | |
| tree | ca0019b455cf2dd44adc3704bc80091eb36e2d8a | |
| parent | term: don't double fork new terminal windows (diff) | |
slave: restore signal mask
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | slave.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 822b5527..86702235 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,7 @@ * Rare crash when scrolling and the new viewport ended up **exactly** on the wrap around. * Selection handling when viewport wrapped around. +* Restore signal mask in the slave process. ### Security @@ -166,10 +166,13 @@ slave_spawn(int ptmx, int argc, const char *cwd, char *const *argv, } /* Restore signals */ + sigset_t mask; + sigemptyset(&mask); const struct sigaction sa = {.sa_handler = SIG_DFL}; if (sigaction(SIGINT, &sa, NULL) < 0 || sigaction(SIGTERM, &sa, NULL) < 0 || - sigaction(SIGHUP, &sa, NULL) < 0) + sigaction(SIGHUP, &sa, NULL) < 0 || + sigprocmask(SIG_SETMASK, &mask, NULL) < 0) { const int _errno = errno; LOG_ERRNO_P("failed to restore signals", errno); |
