From d7fdf45a4ae1bcb6fac30a24b025d4f20149ba0a Mon Sep 17 00:00:00 2001
From: Samuel Williams <samuel.williams@oriontransfer.co.nz>
Date: Fri, 19 Jul 2019 11:09:52 +1200
Subject: [PATCH] Ensure cfp is initialized to NULL.

`cont_init` didn't initialize `cont->saved_ec.cfp`. Calling `cont_mark`
would result in an invalid `cfp` in `rb_execution_context_mark`. Because
fibers lazy-initialize the stack, fibers that are created but not resumed
could cause this problem to occur.
---
 cont.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cont.c b/cont.c
index c0be42bffc..984733db6e 100644
--- a/cont.c
+++ b/cont.c
@@ -845,6 +845,8 @@ cont_mark(void *ptr)
     RUBY_MARK_ENTER("cont");
     rb_gc_mark_no_pin(cont->value);
 
+    // Don't try to scan the vm_stack unless it's initialized.
+    // @sa cont_init, fiber_prepare_stack
     if (cont->saved_ec.cfp) {
         rb_execution_context_mark(&cont->saved_ec);
     }
@@ -1083,6 +1085,10 @@ cont_init(rb_context_t *cont, rb_thread_t *th)
 {
     /* save thread context */
     cont_save_thread(cont, th);
+
+    // cfp is not valid until stack is initialized.
+    cont->saved_ec.cfp = NULL;
+
     cont->saved_ec.thread_ptr = th;
     cont->saved_ec.local_storage = NULL;
     cont->saved_ec.local_storage_recursive_hash = Qnil;