From b3418ceb41b9146e58b4b346e3a1d6ae39b8d355 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 29 Mar 2016 05:32:43 +0000 Subject: merge revision(s) 53609: [Backport #12011] * marshal.c (r_object0): honor Marshal.load post proc value for TYPE_LINK. by Hiroshi Nakamura 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 --- marshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'marshal.c') 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: -- cgit v1.2.3