diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | thread_pthread.c | 21 |
2 files changed, 28 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Wed Jan 23 13:35:37 2013 Koichi Sasada <[email protected]> + + * thread_pthread.c (ruby_init_stack): ignore `STACK_END_ADDRESS' + if Ruby interpreter is running on co-routine. + [Feature #2294] + https://bugs.ruby-lang.org/issues/2294#note-18 + Wed Jan 23 12:28:22 2013 Nobuyoshi Nakada <[email protected]> * win32/win32.c (rb_w32_spawn, rb_w32_aspawn_flags): check the results diff --git a/thread_pthread.c b/thread_pthread.c index 6c48224a87..6e5f53fa67 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -643,6 +643,27 @@ ruby_init_stack(volatile VALUE *addr native_main_thread.stack_maxsize = space; #endif } + + /* If addr is out of range of main-thread stack range estimation, */ + /* it should be on co-routine (alternative stack). [Feature #2294] */ + { + void *start, *end; + + if (IS_STACK_DIR_UPPER()) { + start = native_main_thread.stack_start; + end = (char *)native_main_thread.stack_start + native_main_thread.stack_maxsize; + } + else { + start = (char *)native_main_thread.stack_start - native_main_thread.stack_maxsize; + end = native_main_thread.stack_start; + } + + if ((void *)addr < start || (void *)addr > end) { + /* out of range */ + native_main_thread.stack_start = (VALUE *)addr; + native_main_thread.stack_maxsize = 0; /* unknown */ + } + } } #define CHECK_ERR(expr) \ |