blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 09:09:03 -04:00
Code Issues Projects Releases Wiki Activity

ensure we're allocating sufficient memory for sigaltstack() #2828

Browse Source
This commit is contained in:
nick black 2025-01-02 02:56:55 -05:00
parent c6b13e08a3
commit ee50c6f006
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/unixsig.c
View File

@ -207,24 +207,25 @@ int setup_signals(void* vnc, bool no_quit_sigs, bool no_winch_sigs,
handling_winch = true;
}
if(!no_quit_sigs){
memset(&sa, 0, sizeof(sa));
// AddressSanitizer doesn't want us to use sigaltstack(). we could force everyone
// to export ASAN_OPTIONS=use_sigaltstack=0, or just not fuck with the alternate
// signal stack when built with ASAN.
#ifndef USE_ASAN
alt_signal_stack.ss_size = SIGSTKSZ * 4;
alt_signal_stack.ss_sp = malloc(alt_signal_stack.ss_size);
if(alt_signal_stack.ss_sp == NULL){
fprintf(stderr, "warning: couldn't create alternate signal stack (%s)" NL, strerror(errno));
}else{
alt_signal_stack.ss_size = SIGSTKSZ * 4;
alt_signal_stack.ss_flags = 0;
if(sigaltstack(&alt_signal_stack, NULL)){
fprintf(stderr, "warning: couldn't set up alternate signal stack (%s)" NL, strerror(errno));
free(alt_signal_stack.ss_sp);
alt_signal_stack.ss_sp = NULL;
}else{
sa.sa_flags = SA_ONSTACK;
}
}
#endif
memset(&sa, 0, sizeof(sa));
fatal_callback = handler;
sa.sa_sigaction = fatal_handler;
sigaddset(&sa.sa_mask, SIGABRT);
@ -236,7 +237,7 @@ int setup_signals(void* vnc, bool no_quit_sigs, bool no_winch_sigs,
sigaddset(&sa.sa_mask, SIGSEGV);
sigaddset(&sa.sa_mask, SIGTERM);
// don't try to handle fatal signals twice, and use our alternative stack
sa.sa_flags = SA_ONSTACK | SA_SIGINFO | SA_RESETHAND;
sa.sa_flags |= SA_SIGINFO | SA_RESETHAND;
int ret = 0;
ret |= sigaction(SIGABRT, &sa, &old_abrt);
ret |= sigaction(SIGBUS, &sa, &old_bus);