summaryrefslogtreecommitdiff
path: root/marshal.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-25 10:27:07 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-25 10:27:07 +0000
commitca8b2d26f03b5bb5e71a0de6bab1580b6326fe14 (patch)
tree247305d6c4da35c3efbc16120ffdcff258d39286 /marshal.c
parent63b34adea2eb7af969f7523d34a72427b8b8dbde (diff)
merge revision(s) 53609: [Backport #12011]
* marshal.c (r_object0): honor Marshal.load post proc value for TYPE_LINK. by Hiroshi Nakamura <nahi@ruby-lang.org> https://github.com/ruby/ruby/pull/1204 fix GH-1204 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r--marshal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/marshal.c b/marshal.c
index 9aba5e3204..fd6e12f0d9 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1499,7 +1499,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
rb_raise(rb_eArgError, "dump format error (unlinked)");
}
v = (VALUE)link;
- r_post_proc(v, arg);
+ v = r_post_proc(v, arg);
break;
case TYPE_IVAR: