From 0b5cd2822c2589a5d5670a651d21f20908eddbe2 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 21 Jan 2016 08:36:01 +0000 Subject: * 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/trunk@53609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ marshal.c | 2 +- test/ruby/test_marshal.rb | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1b7b04e69b..b6c0c75721 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jan 21 17:34:01 2016 NARUSE, Yui + + * 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 + Thu Jan 21 16:37:50 2016 NARUSE, Yui * Makefile.in (update-rubyspec): fix r53208 like r53451. 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: diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index 482637fa12..8377de2155 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -712,4 +712,10 @@ class TestMarshal < Test::Unit::TestCase assert_predicate(status, :success?) assert_equal(expected, out) end + + def test_marshal_honor_post_proc_value_for_link + str = 'x' # for link + obj = [str, str] + assert_equal(['X', 'X'], Marshal.load(Marshal.dump(obj), ->(v) { v == str ? v.upcase : v })) + end end -- cgit v1.2.3