diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-17 08:41:57 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-17 08:41:57 +0000 |
commit | dd998dd561c75054679f69b7e9d30af4bae7cfaa (patch) | |
tree | 45788a8865b567ce720366a01408fa74abbf89ef /marshal.c | |
parent | 8ae07cf34b3f8b428a46efa89b31bc3795b451d6 (diff) | |
download | ruby-dd998dd561c75054679f69b7e9d30af4bae7cfaa.tar.gz |
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
Diffstat (limited to 'marshal.c')
-rw-r--r-- | marshal.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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; } |