diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | thread_pthread.c | 50 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 35 insertions, 22 deletions
@@ -1,3 +1,8 @@ +Sat Apr 20 01:56:32 2013 Yuki Yugui Sonoda <yugui@google.com> + + * thread_pthread.c (ruby_init_stack): Avoid using uninitialized value. + stackaddr and size are not set if get_stack() fails. + Sat Apr 20 01:47:31 2013 Yuki Yugui Sonoda <yugui@google.com> * thread_pthread.c: Fixes wrong scopes of #if USE_SLEEPY_TIMER_THREAD diff --git a/thread_pthread.c b/thread_pthread.c index 0004c6791e..6c22870c1e 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -603,6 +603,23 @@ static struct { extern void *STACK_END_ADDRESS; #endif +enum { + RUBY_STACK_SPACE_LIMIT = 1024 * 1024, /* 1024KB */ + RUBY_STACK_SPACE_RATIO = 5 +}; + +static size_t +space_size(size_t stack_size) +{ + size_t space_size = stack_size / RUBY_STACK_SPACE_RATIO; + if (space_size > RUBY_STACK_SPACE_LIMIT) { + return RUBY_STACK_SPACE_LIMIT; + } + else { + return space_size; + } +} + #undef ruby_init_stack /* Set stack bottom of Ruby implementation. * @@ -633,13 +650,21 @@ ruby_init_stack(volatile VALUE *addr } #endif { - size_t size = 0; - size_t space = 0; +#if defined(PTHREAD_STACK_DEFAULT) +# if PTHREAD_STACK_DEFAULT < RUBY_STACK_SPACE*5 +# error "PTHREAD_STACK_DEFAULT is too small" +# endif + size_t size = PTHREAD_STACK_DEFAULT; +#else + size_t size = RUBY_VM_THREAD_VM_STACK_SIZE; +#endif + size_t space = space_size(size); #if MAINSTACKADDR_AVAILABLE void* stackaddr; STACK_GROW_DIR_DETECTION; - get_stack(&stackaddr, &size); - space = STACK_DIR_UPPER((char *)addr - (char *)stackaddr, (char *)stackaddr - (char *)addr); + if (get_stack(&stackaddr, &size) == 0) { + space = STACK_DIR_UPPER((char *)addr - (char *)stackaddr, (char *)stackaddr - (char *)addr); + } native_main_thread.stack_maxsize = size - space; #elif defined(HAVE_GETRLIMIT) int pagesize = getpagesize(); @@ -846,23 +871,6 @@ use_cached_thread(rb_thread_t *th) return result; } -enum { - RUBY_STACK_SPACE_LIMIT = 1024 * 1024, /* 1024KB */ - RUBY_STACK_SPACE_RATIO = 5 -}; - -static size_t -space_size(size_t stack_size) -{ - size_t space_size = stack_size / RUBY_STACK_SPACE_RATIO; - if (space_size > RUBY_STACK_SPACE_LIMIT) { - return RUBY_STACK_SPACE_LIMIT; - } - else { - return space_size; - } -} - static int native_thread_create(rb_thread_t *th) { @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-04-20" -#define RUBY_PATCHLEVEL 151 +#define RUBY_PATCHLEVEL 152 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 4 |