1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* signal.c (sigsegv): avoid to use async signal unsafe functions

Browse Source 
when nested sigsegv is happen.
  [Bug #5014] [ruby-dev:44082]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2013-02-21 05:18:38 +00:00
parent 8a9dc061f5
commit 7355c6d9c9
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Feb 21 14:14:13 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* signal.c (sigsegv): avoid to use async signal unsafe functions
when nested sigsegv is happen.
[Bug #5014] [ruby-dev:44082]
Thu Feb 21 13:47:59 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Thu Feb 21 13:47:59 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* file.c (rb_group_member): added an error check. SUS says, * file.c (rb_group_member): added an error check. SUS says,

29
signal.c
View File

@ -626,10 +626,31 @@ sigbus(int sig SIGINFO_ARG)
#endif #endif
#ifdef SIGSEGV #ifdef SIGSEGV
static void ruby_abort(void)
{
#ifdef __sun
/* Solaris's abort() is async signal unsafe. Of course, it is not
* POSIX compliant.
*/
raise(SIGABRT)
#else
abort();
#endif
}
static int segv_received = 0; static int segv_received = 0;
extern int ruby_disable_gc_stress;
static RETSIGTYPE static RETSIGTYPE
sigsegv(int sig SIGINFO_ARG) sigsegv(int sig SIGINFO_ARG)
{ {
if (segv_received) {
char msg[] = "SEGV received in SEGV handler\n";
write(2, msg, sizeof(msg));
ruby_abort();
}
#ifdef USE_SIGALTSTACK #ifdef USE_SIGALTSTACK
int ruby_stack_overflowed_p(const rb_thread_t *, const void *); int ruby_stack_overflowed_p(const rb_thread_t *, const void *);
NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th)); NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th));
@ -638,17 +659,11 @@ sigsegv(int sig SIGINFO_ARG)
ruby_thread_stack_overflow(th); ruby_thread_stack_overflow(th);
} }
#endif #endif
if (segv_received) {
fprintf(stderr, "SEGV received in SEGV handler\n");
abort();
}
else {
extern int ruby_disable_gc_stress;
segv_received = 1; segv_received = 1;
ruby_disable_gc_stress = 1; ruby_disable_gc_stress = 1;
rb_bug("Segmentation fault"); rb_bug("Segmentation fault");
} }
}
#endif #endif
static void static void