diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-09-29 08:22:42 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-09-29 08:22:42 +0000 |
commit | 431b9dbd009f47458cd502784fad01983e656ce0 (patch) | |
tree | c0ddc60d7a5e9108ad729da3a182747ff235d8be /thread_pthread.c | |
parent | b19d2e9af9c9429f3a84f613432777a6723dd4b7 (diff) |
merge revision(s) 51626: [Backport #11457]
* thread_pthread.c (reserve_stack): ensure the memory is really
allocated. [Bug #11457]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_pthread.c')
-rw-r--r-- | thread_pthread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index ed4880c40c..968c644897 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -681,8 +681,8 @@ reserve_stack(volatile char *limit, size_t size) limit -= size; if (buf > limit) { limit = alloca(buf - limit); + limit[0] = 0; /* ensure alloca is called */ limit -= stack_check_margin; - limit[0] = 0; } } } |