From aa3dda8bcef6d053c07c1b60f61857f5b5e23b7c Mon Sep 17 00:00:00 2001 From: usa Date: Sun, 28 Feb 2021 14:01:55 +0000 Subject: merge revision(s) f72dc407: [Backport #16297] Prohibit calling undefined allocator [Bug #16297] --- object.c | 31 +++++++++++++++++++++++++++++-- test/ruby/test_class.rb | 8 ++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67896 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- object.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'object.c') diff --git a/object.c b/object.c index 454d35790f..f746c90d55 100644 --- a/object.c +++ b/object.c @@ -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 @@ -2111,10 +2114,27 @@ 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); -- cgit v1.2.1