[ruby-cvs:78686] ec2934d504 (ruby_2_6): merge revision(s) c9423b016cfeab852bc5a829e55e0a11f80b3ab7,0b1e26398e018116180 bf41cb63887f77d5d1b82,78ee2c245331e353e218b8fac9ca722a2bcd8fe a: [Backport #15968]

nagachika	2019-12-15 16:14:45 +0900 (Sun, 15 Dec 2019)

  New Revision: ec2934d504

  https://github.com/ruby/ruby/commit/ec2934d504

  Log:
    merge revision(s) c9423b016cfeab852bc5a829e55e0a11f80b3ab7,0b1e26398e018116180bf41cb63887f77d5d1b82,78ee2c245331e353e218b8fac9ca722a2bcd8fea: [Backport #15968]
    
    marshal.c: check instance variable count
    
    * marshal.c (w_obj_each): ensure that no instance variable was
      added while dumping other instance variables.  [Bug #15968]
    
    Hoisted out w_ivar_each
    
    
    marshal.c: check instance variable count
    
    * marshal.c (w_ivar_each): ensure that no instance variable was
      removed while dumping other instance variables.  [Bug #15968]
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

  Modified files:
    marshal.c
    test/ruby/test_marshal.rb
    version.h