Skip to content
  • U.Nakamura's avatar
    f0680bde
    merge revision(s) 52856,52906: [Backport #11760] · f0680bde
    U.Nakamura authored
    	* 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
    
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    f0680bde
    merge revision(s) 52856,52906: [Backport #11760]
    U.Nakamura authored
    	* 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
    
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Loading