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

signal.c: stack overflow on FreeBSD

Browse Source 
* signal.c (check_stack_overflow): check sp also on i386/x86_64
  FreeBSD.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-13 09:01:59 +00:00
parent 7dc4bbc140
commit 02e8b4d9a8
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Dec 13 18:01:57 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* signal.c (check_stack_overflow): check sp also on i386/x86_64
FreeBSD.
Sat Dec 13 09:58:41 2014 Eric Wong <e@80x24.org> Sat Dec 13 09:58:41 2014 Eric Wong <e@80x24.org>
* gc.c (define_final0): avoid duplicate blocks * gc.c (define_final0): avoid duplicate blocks

10
signal.c
View File

@ -732,11 +732,13 @@ rb_get_next_signal(void)
#if defined(USE_SIGALTSTACK) || defined(_WIN32) #if defined(USE_SIGALTSTACK) || defined(_WIN32)
NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th)); NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th));
# if !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__)) # if !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__ || defined __amd64__))
# elif defined __linux__ # elif defined __linux__
# define USE_UCONTEXT_REG 1 # define USE_UCONTEXT_REG 1
# elif defined __APPLE__ # elif defined __APPLE__
# define USE_UCONTEXT_REG 1 # define USE_UCONTEXT_REG 1
# elif defined __FreeBSD__
# define USE_UCONTEXT_REG 1
# endif # endif
# ifdef USE_UCONTEXT_REG # ifdef USE_UCONTEXT_REG
static void static void
@ -755,6 +757,12 @@ check_stack_overflow(const uintptr_t addr, const ucontext_t *ctx)
# else # else
const uintptr_t sp = mctx->__ss.__esp; const uintptr_t sp = mctx->__ss.__esp;
# endif # endif
# elif defined __FreeBSD__
# if defined(__amd64__)
const __register_t sp = mctx->mc_rsp;
# else
const __register_t sp = mctx->mc_esp;
# endif
# endif # endif
enum {pagesize = 4096}; enum {pagesize = 4096};
const uintptr_t sp_page = (uintptr_t)sp / pagesize; const uintptr_t sp_page = (uintptr_t)sp / pagesize;