ruby-changes:67605
From: nagachika <ko1@a...>
Date: Sun, 5 Sep 2021 14:56:01 +0900 (JST)
Subject: [ruby-changes:67605] c42208f8e2 (ruby_3_0): merge revision(s) c0f4e4ca6d0f76985bca79314b232b787c8f008e: [Backport #18007]
https://git.ruby-lang.org/ruby.git/commit/?id=c42208f8e2 From c42208f8e24402fe1aa8747901fba275bfb0d56b Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sun, 5 Sep 2021 14:55:14 +0900 Subject: merge revision(s) c0f4e4ca6d0f76985bca79314b232b787c8f008e: [Backport #18007] undefine alloc functions for C extensions per guidance in doc/extension.rdoc, these classes now undefine their alloc functions: - ObjectSpace::InternalObjectWrapper - Socket::Ifaddr --- ext/objspace/objspace.c | 1 + ext/socket/ifaddr.c | 1 + 2 files changed, 2 insertions(+) --- ext/objspace/objspace.c | 1 + ext/socket/ifaddr.c | 1 + version.h | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c index 7afdfc1..3fa4fd2 100644 --- a/ext/objspace/objspace.c +++ b/ext/objspace/objspace.c @@ -996,6 +996,7 @@ Init_objspace(void) https://github.com/ruby/ruby/blob/trunk/ext/objspace/objspace.c#L996 * You can use the #type method to check the type of the internal object. */ rb_cInternalObjectWrapper = rb_define_class_under(rb_mObjSpace, "InternalObjectWrapper", rb_cObject); + rb_undef_alloc_func(rb_cInternalObjectWrapper); rb_define_method(rb_cInternalObjectWrapper, "type", iow_type, 0); rb_define_method(rb_cInternalObjectWrapper, "inspect", iow_inspect, 0); rb_define_method(rb_cInternalObjectWrapper, "internal_object_id", iow_internal_object_id, 0); diff --git a/ext/socket/ifaddr.c b/ext/socket/ifaddr.c index da01325..1da259b 100644 --- a/ext/socket/ifaddr.c +++ b/ext/socket/ifaddr.c @@ -460,6 +460,7 @@ rsock_init_sockifaddr(void) https://github.com/ruby/ruby/blob/trunk/ext/socket/ifaddr.c#L460 * Socket::Ifaddr represents a result of getifaddrs() function. */ rb_cSockIfaddr = rb_define_class_under(rb_cSocket, "Ifaddr", rb_cObject); + rb_undef_alloc_func(rb_cSockIfaddr); rb_define_method(rb_cSockIfaddr, "inspect", ifaddr_inspect, 0); rb_define_method(rb_cSockIfaddr, "name", ifaddr_name, 0); rb_define_method(rb_cSockIfaddr, "ifindex", ifaddr_ifindex, 0); diff --git a/version.h b/version.h index 44efd8f..b34bdf0 100644 --- a/version.h +++ b/version.h @@ -12,7 +12,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L12 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 128 +#define RUBY_PATCHLEVEL 129 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 9 -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/