archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 09:04:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 50316: [Backport #11030]

Browse source 
* thread_pthread.c (reserve_stack): keep sp safe zone to get rid
	  of crash by -fstack-check.  [ruby-core:68740] [Bug #11030]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-05-13 15:28:06 +00:00
parent 08eae7c14b
commit 0224bb0385
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
thread_pthread.c
View file

@ -662,11 +662,16 @@ reserve_stack(volatile char *limit, size_t size)
# endif
struct rlimit rl;
volatile char buf[0x100];
enum {stack_check_margin = 0x1000}; /* for -fstack-check */
STACK_GROW_DIR_DETECTION;
if (!getrlimit(RLIMIT_STACK, &rl) && rl.rlim_cur == RLIM_INFINITY)
return;
if (size < stack_check_margin) return;
size -= stack_check_margin;
size -= sizeof(buf); /* margin */
if (IS_STACK_DIR_UPPER()) {
const volatile char *end = buf + sizeof(buf);
@ -674,13 +679,14 @@ reserve_stack(volatile char *limit, size_t size)
if (limit > end) {
size = limit - end;
limit = alloca(size);
limit[size-1] = 0;
limit[stack_check_margin+size-1] = 0;
}
}
else {
limit -= size;
if (buf > limit) {
limit = alloca(buf - limit);
limit -= stack_check_margin;
limit[0] = 0;
}
}