diff options
| -rw-r--r-- | object.c | 31 | ||||
| -rw-r--r-- | test/ruby/test_class.rb | 5 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 35 insertions, 3 deletions
@@ -2089,6 +2089,9 @@ rb_undefined_alloc(VALUE klass) klass); } +static rb_alloc_func_t class_get_alloc_func(VALUE klass); +static VALUE class_call_alloc_func(rb_alloc_func_t allocator, VALUE klass); + /* * call-seq: * class.allocate() -> obj @@ -2112,9 +2115,26 @@ rb_undefined_alloc(VALUE klass) */ static VALUE +rb_class_alloc_m(VALUE klass) +{ + rb_alloc_func_t allocator = class_get_alloc_func(klass); + if (!rb_obj_respond_to(klass, rb_intern("allocate"), 1)) { + rb_raise(rb_eTypeError, "calling %"PRIsVALUE".allocate is prohibited", + klass); + } + return class_call_alloc_func(allocator, klass); +} + +static VALUE rb_class_alloc(VALUE klass) { - VALUE obj; + rb_alloc_func_t allocator = class_get_alloc_func(klass); + return class_call_alloc_func(allocator, klass); +} + +static rb_alloc_func_t +class_get_alloc_func(VALUE klass) +{ rb_alloc_func_t allocator; if (RCLASS_SUPER(klass) == 0 && klass != rb_cBasicObject) { @@ -2127,6 +2147,13 @@ rb_class_alloc(VALUE klass) if (!allocator) { rb_undefined_alloc(klass); } + return allocator; +} + +static VALUE +class_call_alloc_func(rb_alloc_func_t allocator, VALUE klass) +{ + VALUE obj; RUBY_DTRACE_CREATE_HOOK(OBJECT, rb_class2name(klass)); @@ -4268,7 +4295,7 @@ InitVM_Object(void) rb_define_method(rb_cModule, "deprecate_constant", rb_mod_deprecate_constant, -1); /* in variable.c */ rb_define_method(rb_cModule, "singleton_class?", rb_mod_singleton_p, 0); - rb_define_method(rb_cClass, "allocate", rb_class_alloc, 0); + rb_define_method(rb_cClass, "allocate", rb_class_alloc_m, 0); rb_define_method(rb_cClass, "new", rb_class_s_new, -1); rb_define_method(rb_cClass, "initialize", rb_class_initialize, -1); rb_define_method(rb_cClass, "superclass", rb_class_superclass, 0); diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb index ad2caeb8be..7903a7c178 100644 --- a/test/ruby/test_class.rb +++ b/test/ruby/test_class.rb @@ -232,6 +232,11 @@ class TestClass < Test::Unit::TestCase assert_raise(TypeError) { Class.allocate.superclass } bug6863 = '[ruby-core:47148]' assert_raise(TypeError, bug6863) { Class.new(Class.allocate) } + + allocator = Class.instance_method(:allocate) + assert_raise_with_message(TypeError, /prohibited/) { + allocator.bind(Rational).call + } end def test_nonascii_name @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.7" #define RUBY_RELEASE_DATE "2021-02-28" -#define RUBY_PATCHLEVEL 155 +#define RUBY_PATCHLEVEL 156 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 2 |