summaryrefslogtreecommitdiff
path: root/marshal.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-29 05:32:43 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-29 05:32:43 +0000
commitb3418ceb41b9146e58b4b346e3a1d6ae39b8d355 (patch)
treebf3a46f7a99f616fc1cad291e8758bd0ed393633 /marshal.c
parent9dc5776878b9e09077f86305b8b115b3f4b770b3 (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_3@54357 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 d67ce87145..d64e5ffc54 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1569,7 +1569,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: