1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

marshal.c: lookup and remove

Browse Source 
* marshal.c (r_fixup_compat): delete compatible object with
  lookup.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-12-02 06:50:41 +00:00
parent 4bef8cffa3
commit a497ed3733
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
marshal.c
View File

@ -1420,15 +1420,14 @@ static VALUE
r_fixup_compat(VALUE v, struct load_arg *arg) r_fixup_compat(VALUE v, struct load_arg *arg)
{ {
st_data_t data; st_data_t data;
if (arg->compat_tbl && st_lookup(arg->compat_tbl, v, &data)) { st_data_t key = (st_data_t)v;
if (arg->compat_tbl && st_delete(arg->compat_tbl, &key, &data)) {
VALUE real_obj = (VALUE)data; VALUE real_obj = (VALUE)data;
rb_alloc_func_t allocator = rb_get_alloc_func(CLASS_OF(real_obj)); rb_alloc_func_t allocator = rb_get_alloc_func(CLASS_OF(real_obj));
st_data_t key = v;
if (st_lookup(compat_allocator_tbl, (st_data_t)allocator, &data)) { if (st_lookup(compat_allocator_tbl, (st_data_t)allocator, &data)) {
marshal_compat_t *compat = (marshal_compat_t*)data; marshal_compat_t *compat = (marshal_compat_t*)data;
compat->loader(real_obj, v); compat->loader(real_obj, v);
} }
st_delete(arg->compat_tbl, &key, 0);
v = real_obj; v = real_obj;
} }
return v; return v;