diff options
author | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-19 14:47:26 +0000 |
---|---|---|
committer | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-19 14:47:26 +0000 |
commit | e90ccd3beb0b9bf1125461ef68943578739bebbe (patch) | |
tree | 966be7dfa9a9c9013770fdbaa87ff09597197c1e | |
parent | b8422636967a53f598968fbbc49326dd4ab027c6 (diff) | |
download | ruby-e90ccd3beb0b9bf1125461ef68943578739bebbe.tar.gz |
* marshal.c (marshal_dump, marshal_load): fix SEGV during make rdoc
and test failure in TestMarshal#test_gc and test_context_switch
on SPARC Solaris 10 compiled with Oracle Solaris Studio 12.3.
[Bug #7591] [ruby-dev:46772]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | marshal.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Wed Dec 19 23:36:12 2012 Naohisa Goto <ngotogenome@gmail.com> + + * marshal.c (marshal_dump, marshal_load): fix SEGV during make rdoc + and test failure in TestMarshal#test_gc and test_context_switch + on SPARC Solaris 10 compiled with Oracle Solaris Studio 12.3. + [Bug #7591] [ruby-dev:46772] + Wed Dec 19 19:34:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * object.c (rb_mod_const_get): nul byte is invalid as constant name. @@ -934,7 +934,7 @@ marshal_dump(int argc, VALUE *argv) else if (NIL_P(a1)) io_needed(); else port = a1; } - wrapper = TypedData_Make_Struct(rb_cData, struct dump_arg, &dump_arg_data, arg); + RB_GC_GUARD(wrapper) = TypedData_Make_Struct(rb_cData, struct dump_arg, &dump_arg_data, arg); arg->dest = 0; arg->symbols = st_init_numtable(); arg->data = st_init_numtable(); @@ -1907,7 +1907,7 @@ marshal_load(int argc, VALUE *argv) else { io_needed(); } - wrapper = TypedData_Make_Struct(rb_cData, struct load_arg, &load_arg_data, arg); + RB_GC_GUARD(wrapper) = TypedData_Make_Struct(rb_cData, struct load_arg, &load_arg_data, arg); arg->infection = infection; arg->src = port; arg->offset = 0; |