[ruby-cvs:60127] nagachika:r52974 (ruby_2_2): merge revision(s) 52856, 52906: [Backport #11760]

nagachika at ruby-lang.org nagachika at ruby-lang.org
Wed Dec 9 01:44:47 JST 2015


nagachika	2015-12-09 01:44:45 +0900 (Wed, 09 Dec 2015)

  New Revision: 52974

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

  Log:
    merge revision(s) 52856,52906: [Backport #11760]
    
    * encoding.c (enc_m_loader): defer finding encoding object not to
      be infected by marshal source.  [ruby-core:71793] [Bug #11760]
    
    * marshal.c (r_object0): enable compatible loader on USERDEF
      class.  the loader function is called with the class itself,
      instead of an allocated object, and the loaded data.
    
    * marshal.c (compat_allocator_table): intialize
      compat_allocator_tbl on demand.
    
    * object.c (rb_undefined_alloc): extract from rb_obj_alloc.
    
    * marshal.c (compat_allocator_table): initialize

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/encoding.c
    branches/ruby_2_2/internal.h
    branches/ruby_2_2/marshal.c
    branches/ruby_2_2/object.c
    branches/ruby_2_2/test/ruby/test_encoding.rb
    branches/ruby_2_2/version.h


More information about the ruby-cvs mailing list