diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-09-04 15:17:42 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-09-04 15:17:42 +0900 |
commit | d164eef9577175e51bc17c1da75a9092d86030a9 (patch) | |
tree | d984b16d3bc8e718c45df2d2aa1d261cdb47bf1d | |
parent | fbaab562d99c220bd481c17522c02c865ba7c44c (diff) |
Fixed heap-use-after-free on racter
-rw-r--r-- | gc.c | 3 | ||||
-rw-r--r-- | ractor.c | 8 |
2 files changed, 11 insertions, 0 deletions
@@ -3597,6 +3597,8 @@ force_chain_object(st_data_t key, st_data_t val, st_data_t arg) return ST_CONTINUE; } +bool rb_obj_is_main_ractor(VALUE gv); + void rb_objspace_call_finalizer(rb_objspace_t *objspace) { @@ -3652,6 +3654,7 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace) if (rb_obj_is_thread(vp)) break; if (rb_obj_is_mutex(vp)) break; if (rb_obj_is_fiber(vp)) break; + if (rb_obj_is_main_ractor(vp)) break; if (RTYPEDDATA_P(vp)) { RDATA(p)->dfree = RANY(p)->as.typeddata.type->function.dfree; } @@ -1434,6 +1434,14 @@ rb_ractor_main_p_(void) return rb_ec_ractor_ptr(ec) == rb_ec_vm_ptr(ec)->ractor.main_ractor; } +bool +rb_obj_is_main_ractor(VALUE gv) +{ + if (!rb_ractor_p(gv)) return false; + rb_ractor_t *r = DATA_PTR(gv); + return r == GET_VM()->ractor.main_ractor; +} + rb_global_vm_lock_t * rb_ractor_gvl(rb_ractor_t *r) { |