1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure cfp is initialized to NULL.

Browse Source 
`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.
This commit is contained in:
Samuel Williams 2019-07-19 11:09:52 +12:00
parent 9dda0a03cc
commit d7fdf45a4a
No known key found for this signature in database
GPG Key ID: A0765423A44728FB
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cont.c
View File

@ -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;