diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | marshal.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_marshal.rb | 6 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Tue Mar 29 14:22:57 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * 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 + Tue Mar 29 14:18:26 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> * .travis.yml: removed commented-out code. @@ -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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 15 +#define RUBY_PATCHLEVEL 16 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |