archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 21:14:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) r46495,r46499: [Backport #9971]

Browse source 
signal.c: no cfunc frame at stack overflow

	* signal.c (check_stack_overflow): avoid pushing a cfunc frame,
  trying to fix stack overflow deadlock.
	* signal.c (check_stack_overflow): drop the last tag too close to
	  the fault page, to get rid of stack overflow deadlock.
	  [Bug #9971]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-09-15 14:23:13 +00:00
parent e54ec54d2d
commit 155b12e673
3 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Sep 15 23:12:47 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* signal.c (check_stack_overflow): drop the last tag too close to
the fault page, to get rid of stack overflow deadlock.
[Bug #9971]
Mon Sep 15 22:34:39 2014 Natalie Weizenbaum <nweiz@google.com> Mon Sep 15 22:34:39 2014 Natalie Weizenbaum <nweiz@google.com>
* ext/pathname/lib/pathname.rb (SAME_PATHS): * ext/pathname/lib/pathname.rb (SAME_PATHS):

11
signal.c
View file

@ -711,7 +711,14 @@ check_stack_overflow(const uintptr_t addr, const ucontext_t *ctx)
/* SP in ucontext is not decremented yet when `push` failed, so /* SP in ucontext is not decremented yet when `push` failed, so
* the fault page can be the next. */ * the fault page can be the next. */
if (sp_page == fault_page || sp_page == fault_page + 1) { if (sp_page == fault_page || sp_page == fault_page + 1) {
ruby_thread_stack_overflow(GET_THREAD()); rb_thread_t *th = ruby_current_thread;
if ((uintptr_t)th->tag->buf / pagesize == sp_page) {
/* drop the last tag if it is close to the fault,
* otherwise it can cause stack overflow again at the same
* place. */
th->tag = th->tag->prev;
}
ruby_thread_stack_overflow(th);
} }
} }
#else #else
@ -719,7 +726,7 @@ static void
check_stack_overflow(const void *addr) check_stack_overflow(const void *addr)
{ {
int ruby_stack_overflowed_p(const rb_thread_t *, const void *); int ruby_stack_overflowed_p(const rb_thread_t *, const void *);
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = ruby_current_thread;
if (ruby_stack_overflowed_p(th, addr)) { if (ruby_stack_overflowed_p(th, addr)) {
ruby_thread_stack_overflow(th); ruby_thread_stack_overflow(th);
} }

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.2" #define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-09-15" #define RUBY_RELEASE_DATE "2014-09-15"
#define RUBY_PATCHLEVEL 240 #define RUBY_PATCHLEVEL 241
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 9 #define RUBY_RELEASE_MONTH 9