diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-23 19:18:57 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-23 19:18:57 +0000 |
commit | 2e081760e3007505ac821869a15ca2922b88b4f9 (patch) | |
tree | 22705ae3d1c5bdce7f92e74913094d317d483d6e /ChangeLog | |
parent | 55849b02bd0c3caba2bda4e6141a528861ea8526 (diff) |
merge revision(s) 50057,50065: [Backport #10991]
* marshal.c (r_symreal): register symbol names as strings first so
that r_symlink always returns valid names.
[ruby-core:68587] [Bug #10991]
* marshal.c (r_ivar, r_object0): now need to intern symbol names.
* marshal.c (r_object0): compare with symbol names.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,13 @@ +Sun May 24 03:56:27 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * marshal.c (r_symreal): register symbol names as strings first so + that r_symlink always returns valid names. + [ruby-core:68587] [Bug #10991] + + * marshal.c (r_ivar, r_object0): now need to intern symbol names. + + * marshal.c (r_object0): compare with symbol names. + Sun May 24 03:53:07 2015 Eric Wong <e@80x24.org> * ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard |