generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 77f90de7: am fc104f89: Merge "Fix abort(3) to raise SIGABRT rather than causing SIGSEGV."

Browse Source 
* commit '77f90de728b9fa60b83b7f12a45c1113f3189cb2':
  Fix abort(3) to raise SIGABRT rather than causing SIGSEGV.
This commit is contained in:
Ben Cheng 2013-06-10 17:28:46 -07:00 committed by Android Git Automerger
commit d20a04c5cf
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libc/arch-arm/bionic/tgkill.S
View File

@ -39,6 +39,7 @@
*/
ENTRY(tgkill)
.save {r4-r7, ip, lr}
stmfd sp!, {r4-r7, ip, lr}
ldr r7, =__NR_tgkill
swi #0

18
libc/unistd/abort.c
View File

@ -53,9 +53,7 @@ abort(void)
* any errors -- X311J doesn't allow abort to return anyway.
*/
sigdelset(&mask, SIGABRT);
/* temporary, so deliberate seg fault can be caught by debuggerd */
sigdelset(&mask, SIGSEGV);
/* -- */
(void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
/*
@ -72,17 +70,7 @@ abort(void)
}
}
/* temporary, for bug hunting */
/* seg fault seems to produce better debuggerd results than SIGABRT */
#ifdef __mips__
/* An access that will generate SIGSEGV rather than SIGBUS. */
*((char*)0xdeadc0c0) = 39;
#else
*((char*)0xdeadbaad) = 39;
#endif
/* -- */
(void)kill(getpid(), SIGABRT);
raise(SIGABRT);
/*
* if SIGABRT ignored, or caught and the handler returns, do
@ -99,6 +87,6 @@ abort(void)
}
(void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
(void)kill(getpid(), SIGABRT);
raise(SIGABRT);
_exit(1);
}