From 23cf80667a36aaff1865fc50afab3f98a796cf14 Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Sat, 12 Feb 2022 12:04:57 +0000 Subject: Explicitly initialize sigaction::sa_mask members with sigemptyset(3) Not doing so before calling sigaction(3) is "undefined" according to POSIX[1]: > Applications shall call either sigemptyset() or sigfillset() at least > once for each object of type sigset_t prior to any other use of that > object. If such an object is not initialized in this way, but is > nonetheless supplied as an argument to any of pthread_sigmask(), > sigaction(), sigaddset(), sigdelset(), sigismember(), sigpending(), > sigprocmask(), sigsuspend(), sigtimedwait(), sigwait(), or > sigwaitinfo(), the results are undefined. The use of designated initializers means that sa_mask members were still being initialized, but sigset_t is an opaque type and implicit initialization doesn't necessarily produce the same results as using sigemptyset(3) (although it typically does on most implementations). [1]: https://pubs.opengroup.org/onlinepubs/9699919799/functions/sigaddset.html --- terminal.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'terminal.c') diff --git a/terminal.c b/terminal.c index 66c523df..f6d8f814 100644 --- a/terminal.c +++ b/terminal.c @@ -1716,7 +1716,9 @@ term_destroy(struct terminal *term) * course only applies to a 'foot --server' instance, where * there might be other terminals running. */ - sigaction(SIGALRM, &(const struct sigaction){.sa_handler = &sig_alarm}, NULL); + struct sigaction action = {.sa_handler = &sig_alarm}; + sigemptyset(&action.sa_mask); + sigaction(SIGALRM, &action, NULL); alarm(60); while (true) { @@ -1740,7 +1742,8 @@ term_destroy(struct terminal *term) /* Cancel alarm */ alarm(0); - sigaction(SIGALRM, &(const struct sigaction){.sa_handler = SIG_DFL}, NULL); + action.sa_handler = SIG_DFL; + sigaction(SIGALRM, &action, NULL); } ret = EXIT_FAILURE; -- cgit v1.3