[ruby-cvs:58669] nagachika:r51521 (ruby_2_2): merge revision(s) 51263, 51264: [Backport #11352]

nagachika at ruby-lang.org nagachika at ruby-lang.org
Tue Aug 11 01:31:19 JST 2015


nagachika	2015-08-11 01:31:18 +0900 (Tue, 11 Aug 2015)

  New Revision: 51521

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51521

  Log:
    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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/ruby/test_literal.rb
    branches/ruby_2_2/version.h
    branches/ruby_2_2/vm.c


More information about the ruby-cvs mailing list