diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-27 10:11:49 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-27 10:11:49 +0000 |
| commit | 88c68a89d3bfae15664f59355c013c0c23bd1a63 (patch) | |
| tree | df2356b784fe1b7cfd7466f871e9faa1f639ba9a /ChangeLog | |
| parent | a078bbcc172dae52bfd8bf9d25f7736a544972e8 (diff) | |
merge revision(s) 56894: [Backport #12974]
marshal.c: fix infinite recursion
* marshal.c (check_userdump_arg): marshal_dump should not return
an instance of the same class, otherwise it causes infinite
recursion. [ruby-core:78289] [Bug #12974]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@57211 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 @@ +Tue Dec 27 19:10:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * marshal.c (dump_funcall, dump_check_funcall, load_funcall): + function calls with reentrant check. always show names + corresponding to the called methods. + + * marshal.c (check_userdump_arg): marshal_dump should not return an + instance of the same class, otherwise it causes infinite recursion. + [Bug #12974] + Tue Dec 27 18:34:04 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * compile.c (setup_args): duplicate splatting array if more |