Skip to content

provide SIG_ABORT_SIGSEGV config to prevent catched SIGSEGV pass to JNI. #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexrayne wants to merge 1 commit into
base: master
Choose a base branch
from
Open

provide SIG_ABORT_SIGSEGV config to prevent catched SIGSEGV pass to JNI. #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions coffeecatch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ static const int native_sig_catch[SIG_CATCH_COUNT + 1]
/* Maximum value of a caught signal. */
#define SIG_NUMBER_MAX 32

#ifndef SIG_ABORT_SIGSEGV
// this allows abort SIGSEGV passing to JNI. Rely COFFEE_CATCH handle it well.
#define SIG_ABORT_SIGSEGV 0
#endif

#if defined(__ANDROID__)
#ifndef ucontext_h_seen
#define ucontext_h_seen
Expand Down Expand Up @@ -685,8 +690,14 @@ static int coffeecatch_handler_setup_global(void) {
/* Setup signal handlers for SIGABRT (Java calls abort()) and others. **/
for (i = 0; native_sig_catch[i] != 0; i++) {
const int sig = native_sig_catch[i];
const struct sigaction * const action =
sig == SIGABRT ? &sa_abort : &sa_pass;
const struct sigaction * action = &sa_pass;
switch(sig){
case SIGABRT:
#if SIG_ABORT_SIGSEGV
case SIGSEGV:
#endif
action = &sa_abort;
}
assert(sig < SIG_NUMBER_MAX);
if (sigaction(sig, action, &native_code_g.sa_old[sig]) != 0) {
return -1;
Expand Down