From dd998dd561c75054679f69b7e9d30af4bae7cfaa Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 17 Feb 2014 08:41:57 +0000 Subject: marshal.c: do not recycle wrapper objects * marshal.c (marshal_dump, marshal_load): do not recycle wrapper objects, to prevent from segfault with continuation. [ruby-dev:47970] [Bug #9523] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45025 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- marshal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'marshal.c') diff --git a/marshal.c b/marshal.c index b8106d7e48..7772b4cb2a 100644 --- a/marshal.c +++ b/marshal.c @@ -993,8 +993,8 @@ marshal_dump(int argc, VALUE *argv) rb_io_write(arg->dest, arg->str); rb_str_resize(arg->str, 0); } - free_dump_arg(arg); - rb_gc_force_recycle(wrapper); /* also guards from premature GC */ + clear_dump_arg(arg); + RB_GC_GUARD(wrapper); return port; } @@ -2004,8 +2004,8 @@ marshal_load(int argc, VALUE *argv) if (!NIL_P(proc)) arg->proc = proc; v = r_object(arg); - free_load_arg(arg); - rb_gc_force_recycle(wrapper); /* also guards from premature GC */ + clear_load_arg(arg); + RB_GC_GUARD(wrapper); return v; } -- cgit v1.2.3