summaryrefslogtreecommitdiff
path: root/cont.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-10 14:18:09 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-10 14:18:09 +0000
commit0e0d0c47b890ffea4c8bceb28c0573aa50010e27 (patch)
treeacbf5db516ee4f23ece39f8013d20d49bff15203 /cont.c
parente804822e7af4602562b16143a4f2d5663cd59013 (diff)
merge revision(s) 66111: [Backport #14561]
Avoid GCing dead stack after switching away from a fiber Fixes <https://bugs.ruby-lang.org/issues/14561> and discussed <https://bugs.ruby-lang.org/issues/15362>. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@66777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cont.c')
-rw-r--r--cont.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/cont.c b/cont.c
index f0b8a8a0a8..558d35c4bd 100644
--- a/cont.c
+++ b/cont.c
@@ -1616,6 +1616,7 @@ fiber_store(rb_fiber_t *next_fib, rb_thread_t *th)
return fib->cont.value;
#else /* FIBER_USE_NATIVE */
+ fib->cont.saved_ec.machine.stack_end = NULL;
if (ruby_setjmp(fib->cont.jmpbuf)) {
/* restored */
fib = th->ec->fiber_ptr;