diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-10 16:31:18 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-10 16:31:18 +0000 |
| commit | e49c2e3569ebf5a1304483efca4c92c143a3e321 (patch) | |
| tree | e4286f9d2b8f682645c2367e0c2f105eb251692c /ChangeLog | |
| parent | 00d499992b74a91e8dc539c9076d7a8e9e078296 (diff) | |
merge revision(s) 51263,51264: [Backport #11352]
* vm.c (m_core_hash_merge_ptr): copy the arguments to the machine
stack before rewinding the control frame pointer and leaving the
arguments outside valid region of the value stack.
[ruby-core:69969] [Bug #11352]
* vm.c (REWIND_CFP): keep the arguments region inside the valid
value stack. [ruby-core:69969] [Bug #11352]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51521 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 Aug 11 01:21:49 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm.c (m_core_hash_merge_ptr): copy the arguments to the machine + stack before rewinding the control frame pointer and leaving the + arguments outside valid region of the value stack. + [ruby-core:69969] [Bug #11352] + + * vm.c (REWIND_CFP): keep the arguments region inside the valid + value stack. [ruby-core:69969] [Bug #11352] + Tue Aug 11 01:11:02 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_reverse): reversed string is not a substring, |