[ruby-cvs:60086] usa:r52933 (ruby_2_1): merge revision(s) 52856, 52906: [Backport #11760]

usa at ruby-lang.org usa at ruby-lang.org
Tue Dec 8 11:51:40 JST 2015


usa	2015-12-08 11:51:38 +0900 (Tue, 08 Dec 2015)

  New Revision: 52933

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

  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_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/encoding.c
    branches/ruby_2_1/internal.h
    branches/ruby_2_1/marshal.c
    branches/ruby_2_1/object.c
    branches/ruby_2_1/test/ruby/test_encoding.rb
    branches/ruby_2_1/version.h


More information about the ruby-cvs mailing list