From aec16b754055f5436b2770695ce6f579ed2fc248 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 7 Oct 2019 17:41:26 -0700 Subject: Marshal is calling functions that should pin things --- gc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gc.c') diff --git a/gc.c b/gc.c index 8317b49858..6fcdf2a53c 100644 --- a/gc.c +++ b/gc.c @@ -4710,7 +4710,7 @@ static int mark_key(st_data_t key, st_data_t value, st_data_t data) { rb_objspace_t *objspace = (rb_objspace_t *)data; - gc_mark(objspace, (VALUE)key); + gc_mark_and_pin(objspace, (VALUE)key); return ST_CONTINUE; } @@ -4744,6 +4744,16 @@ mark_keyvalue(st_data_t key, st_data_t value, st_data_t data) return ST_CONTINUE; } +static int +pin_key_pin_value(st_data_t key, st_data_t value, st_data_t data) +{ + rb_objspace_t *objspace = (rb_objspace_t *)data; + + gc_mark_and_pin(objspace, (VALUE)key); + gc_mark_and_pin(objspace, (VALUE)value); + return ST_CONTINUE; +} + static int pin_key_mark_value(st_data_t key, st_data_t value, st_data_t data) { @@ -4779,7 +4789,7 @@ static void mark_st(rb_objspace_t *objspace, st_table *tbl) { if (!tbl) return; - st_foreach(tbl, mark_keyvalue, (st_data_t)objspace); + st_foreach(tbl, pin_key_pin_value, (st_data_t)objspace); } void -- cgit v1.2.3