archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 13:04:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 52856,52906: [Backport #11760]

Browse source 
* 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_2@52974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-12-08 16:44:45 +00:00
parent 4cd4556f95
commit bd4364acb1
7 changed files with 60 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
object.c
View file

@ -1771,6 +1771,13 @@ rb_class_initialize(int argc, VALUE *argv, VALUE klass)
return klass;
}
void
rb_undefined_alloc(VALUE klass)
{
rb_raise(rb_eTypeError, "allocator undefined for %"PRIsVALUE,
klass);
}
/*
* call-seq:
* class.allocate() -> obj
@ -1807,8 +1814,7 @@ rb_obj_alloc(VALUE klass)
}
allocator = rb_get_alloc_func(klass);
if (!allocator) {
rb_raise(rb_eTypeError, "allocator undefined for %"PRIsVALUE,
klass);
rb_undefined_alloc(klass);
}
#if !defined(DTRACE_PROBES_DISABLED) || !DTRACE_PROBES_DISABLED