summaryrefslogtreecommitdiff
path: root/cont.c
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-30 19:14:37 (GMT)
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-30 19:14:37 (GMT)
commit13f4923551bd270404affee07a39020a83e41d57 (patch)
treeba16c0ec2d7b0696072881b3238ab473364ede5d /cont.c
parent3bcb4ff810b9250e12be89156c62497f183648c9 (diff)
cont.c (rb_fiber_atfork): th->root_fiber may not exist
Otherwise, bootstraptest/test_fork.rb fails with -DVM_CHECK_MODE=2 [Bug #15041] Fixes: r64589 "cont.c: set th->root_fiber to current fiber at fork" git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cont.c')
-rw-r--r--cont.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/cont.c b/cont.c
index 3f0a5cb..7bc1724 100644
--- a/cont.c
+++ b/cont.c
@@ -1981,11 +1981,13 @@ fiber_to_s(VALUE fibval)
void
rb_fiber_atfork(rb_thread_t *th)
{
- if (&th->root_fiber->cont.saved_ec != th->ec) {
- th->root_fiber = th->ec->fiber_ptr;
- th->root_fiber->cont.type = ROOT_FIBER_CONTEXT;
+ if (th->root_fiber) {
+ if (&th->root_fiber->cont.saved_ec != th->ec) {
+ th->root_fiber = th->ec->fiber_ptr;
+ th->root_fiber->cont.type = ROOT_FIBER_CONTEXT;
+ }
+ th->root_fiber->prev = 0;
}
- th->root_fiber->prev = 0;
}
#endif