diff options
Diffstat (limited to 'marshal.c')
| -rw-r--r-- | marshal.c | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -927,11 +927,10 @@ r_object(arg) volatile long len = r_long(arg); /* gcc 2.7.2.3 -O2 bug?? */ v = rb_ary_new2(len); - r_regist(v, arg); while (len--) { rb_ary_push(v, r_object(arg)); } - return v; + return r_regist(v, arg);; } case TYPE_HASH: @@ -940,7 +939,6 @@ r_object(arg) long len = r_long(arg); v = rb_hash_new(); - r_regist(v, arg); while (len--) { VALUE key = r_object(arg); VALUE value = r_object(arg); @@ -949,7 +947,7 @@ r_object(arg) if (type == TYPE_HASH_DEF) { RHASH(v)->ifnone = r_object(arg); } - return v; + return r_regist(v, arg); } case TYPE_STRUCT: @@ -971,7 +969,6 @@ r_object(arg) rb_ary_push(values, Qnil); } v = rb_struct_alloc(klass, values); - r_regist(v, arg); for (i=0; i<len; i++) { slot = r_symbol(arg); @@ -983,6 +980,7 @@ r_object(arg) } rb_struct_aset(v, INT2FIX(i), r_object(arg)); } + r_regist(v, arg); return v; } break; @@ -1010,9 +1008,8 @@ r_object(arg) if (TYPE(v) != T_OBJECT) { rb_raise(rb_eArgError, "dump format error"); } - r_regist(v, arg); r_ivar(v, arg); - return v; + return r_regist(v, arg); } break; |